Skip to content

Commit 37c66e0

Browse files
marcelfolaronmarcelfolaron
authored
Merge pull request #3318 from Leantime/fix/postgresql-round-3301
fix: PostgreSQL ROUND error, missing zp_canvas.color migration, and 3.7.2 changelog
2 parents 954ff86 + 6c43741 commit 37c66e0

6 files changed

Lines changed: 61 additions & 87 deletions

File tree

‎.idea/php.xml‎

Lines changed: 0 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/Core/Configuration/AppSettings.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
class AppSettings
99
{
10-
public string $appVersion = '3.7.2';
10+
public string $appVersion = '3.7.3';
1111

12-
public string $dbVersion = '3.5.0';
12+
public string $dbVersion = '3.5.1';
1313
}

‎app/Domain/Install/Repositories/Install.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ class Install
8080
30412,
8181
30413,
8282
30500,
83+
30501,
8384
];
8485

8586
/**
@@ -2468,4 +2469,32 @@ public function update_sql_30500(): bool|array
24682469

24692470
return true;
24702471
}
2472+
2473+
/**
2474+
* Migration 30501: Ensure zp_canvas.color column exists
2475+
*
2476+
* Migration 30411 added this column but could fail silently on MySQL servers
2477+
* with ANSI_QUOTES sql_mode due to DEFAULT "ocean" using double quotes
2478+
* (interpreted as identifier, not string literal). The SQL was fixed in #3284
2479+
* but users who already ran the broken migration have the DB version advanced
2480+
* past 30411 without the column actually existing.
2481+
*
2482+
* @return bool|array Returns true on success, array of errors on failure
2483+
*/
2484+
public function update_sql_30501(): bool|array
2485+
{
2486+
try {
2487+
if (Schema::hasTable('zp_canvas') && ! Schema::hasColumn('zp_canvas', 'color')) {
2488+
Schema::table('zp_canvas', function (Blueprint $table) {
2489+
$table->string('color', 50)->nullable()->default('ocean')->after('description');
2490+
});
2491+
}
2492+
} catch (\Exception $e) {
2493+
Log::error('Migration 30501: '.$e->getMessage());
2494+
2495+
return ['Migration 30501 failed: '.$e->getMessage()];
2496+
}
2497+
2498+
return true;
2499+
}
24712500
}

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "leantime",
3-
"version": "3.7.2",
3+
"version": "3.7.3",
44
"description": "Open source innovation management system",
55
"dependencies": {
66
"@assuradeurengilde/fontawesome-iconpicker": "^3.2.3",

‎public/dist/mix-manifest.json‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"/js/compiled-htmx.3.7.2.min.js": "/js/compiled-htmx.3.7.2.min.js",
3-
"/js/compiled-htmx-extensions.3.7.2.min.js": "/js/compiled-htmx-extensions.3.7.2.min.js",
4-
"/js/compiled-lottieplayer.3.7.2.min.js": "/js/compiled-lottieplayer.3.7.2.min.js",
5-
"/js/compiled-tiptap-editor.3.7.2.min.js": "/js/compiled-tiptap-editor.3.7.2.min.js",
6-
"/css/main.3.7.2.min.css": "/css/main.3.7.2.min.css",
2+
"/js/compiled-htmx.3.7.3.min.js": "/js/compiled-htmx.3.7.3.min.js",
3+
"/js/compiled-htmx-extensions.3.7.3.min.js": "/js/compiled-htmx-extensions.3.7.3.min.js",
4+
"/js/compiled-lottieplayer.3.7.3.min.js": "/js/compiled-lottieplayer.3.7.3.min.js",
5+
"/js/compiled-tiptap-editor.3.7.3.min.js": "/js/compiled-tiptap-editor.3.7.3.min.js",
6+
"/css/main.3.7.3.min.css": "/css/main.3.7.3.min.css",
77
"/images/chosen-sprite-light.png?6768c1976c2ad78da1634b00b1e84dc2": "/images/chosen-sprite-light.png?6768c1976c2ad78da1634b00b1e84dc2",
88
"/images/chosen-sprite-light@2x.png?a0b7f3f18d93f6730bb20aa64fb27644": "/images/chosen-sprite-light@2x.png?a0b7f3f18d93f6730bb20aa64fb27644",
9-
"/images/loading-animation.svg?ab1aba24e1bc5686efac62cba12cafb7": "/images/loading-animation.svg?ab1aba24e1bc5686efac62cba12cafb7",
109
"/images/calarrow.png?560fd036ad4b37c2d23000acc81def00": "/images/calarrow.png?560fd036ad4b37c2d23000acc81def00",
10+
"/images/loading-animation.svg?ab1aba24e1bc5686efac62cba12cafb7": "/images/loading-animation.svg?ab1aba24e1bc5686efac62cba12cafb7",
1111
"/fonts/Atkinson-Hyperlegible-Regular-102.ttf?0f70189614a5d1405a86b2f339e97711": "/fonts/Atkinson-Hyperlegible-Regular-102.ttf?0f70189614a5d1405a86b2f339e97711",
1212
"/fonts/Atkinson-Hyperlegible-Regular-102a.woff2?7572a7a55ffff1170d864220b567ca60": "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2?7572a7a55ffff1170d864220b567ca60",
1313
"/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf?8bec52de3cf4d8e84edadef06c7952a6": "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf?8bec52de3cf4d8e84edadef06c7952a6",
@@ -28,6 +28,14 @@
2828
"/fonts/Roboto-LightItalic.woff2?190334d82bbe926404654db5b272b2a1": "/fonts/Roboto-LightItalic.woff2?190334d82bbe926404654db5b272b2a1",
2929
"/fonts/Roboto-MediumItalic.ttf?82736aaa11c64709055f2b7f1c1dcb0f": "/fonts/Roboto-MediumItalic.ttf?82736aaa11c64709055f2b7f1c1dcb0f",
3030
"/fonts/Roboto-MediumItalic.woff2?506a1f8a1053d4f4fdb2479ad4955db3": "/fonts/Roboto-MediumItalic.woff2?506a1f8a1053d4f4fdb2479ad4955db3",
31+
"/fonts/Atkinson-Hyperlegible-Regular-102.ttf?0f70189614a5d1405a86b2f339e97711": "/fonts/Atkinson-Hyperlegible-Regular-102.ttf?0f70189614a5d1405a86b2f339e97711",
32+
"/fonts/Atkinson-Hyperlegible-Regular-102a.woff2?7572a7a55ffff1170d864220b567ca60": "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2?7572a7a55ffff1170d864220b567ca60",
33+
"/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf?8bec52de3cf4d8e84edadef06c7952a6": "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf?8bec52de3cf4d8e84edadef06c7952a6",
34+
"/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2?eeaf9fcaaa46559f4dfb380b4553c27c": "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2?eeaf9fcaaa46559f4dfb380b4553c27c",
35+
"/fonts/Atkinson-Hyperlegible-Bold-102.ttf?22f63e2e2471cf7f85d279a35b461b9e": "/fonts/Atkinson-Hyperlegible-Bold-102.ttf?22f63e2e2471cf7f85d279a35b461b9e",
36+
"/fonts/Atkinson-Hyperlegible-Bold-102a.woff2?fce21dab976c619b722f82fe445590fa": "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2?fce21dab976c619b722f82fe445590fa",
37+
"/fonts/Atkinson-Hyperlegible-Italic-102.ttf?9d826272a7141f284ab1916b04e3cf1b": "/fonts/Atkinson-Hyperlegible-Italic-102.ttf?9d826272a7141f284ab1916b04e3cf1b",
38+
"/fonts/Atkinson-Hyperlegible-Italic-102a.woff2?deb0b45e55a4a8d034e9085ebc7a8b8d": "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2?deb0b45e55a4a8d034e9085ebc7a8b8d",
3139
"/fonts/Shantell_Sans-Informal_Regular.woff2?241fa2668a31e4eb71e8539cfe60ef4b": "/fonts/Shantell_Sans-Informal_Regular.woff2?241fa2668a31e4eb71e8539cfe60ef4b",
3240
"/fonts/Shantell_Sans-Informal_Bold_Italic.woff2?f6d317a4cc41d53053afbf0a9c9228fc": "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2?f6d317a4cc41d53053afbf0a9c9228fc",
3341
"/fonts/Shantell_Sans-Informal_Bold.woff2?f8bfd61789da277fc19c1e2796ac92f3": "/fonts/Shantell_Sans-Informal_Bold.woff2?f8bfd61789da277fc19c1e2796ac92f3",
@@ -43,19 +51,19 @@
4351
"/fonts/fa-solid-900.ttf?b48ad290d0335879a92bb6a7e8e08976": "/fonts/fa-solid-900.ttf?b48ad290d0335879a92bb6a7e8e08976",
4452
"/fonts/fa-v4compatibility.woff2?745989aab0d69cab7e70bfcc96207b3d": "/fonts/fa-v4compatibility.woff2?745989aab0d69cab7e70bfcc96207b3d",
4553
"/fonts/fa-v4compatibility.ttf?f601162ae669f88823a32a6928d1a528": "/fonts/fa-v4compatibility.ttf?f601162ae669f88823a32a6928d1a528",
46-
"/css/app.3.7.2.min.css": "/css/app.3.7.2.min.css",
47-
"/js/compiled-footer.3.7.2.min.js": "/js/compiled-footer.3.7.2.min.js",
48-
"/js/compiled-app.3.7.2.min.js": "/js/compiled-app.3.7.2.min.js",
49-
"/js/compiled-frameworks.3.7.2.min.js": "/js/compiled-frameworks.3.7.2.min.js",
50-
"/js/compiled-framework-plugins.3.7.2.min.js": "/js/compiled-framework-plugins.3.7.2.min.js",
51-
"/js/compiled-global-component.3.7.2.min.js": "/js/compiled-global-component.3.7.2.min.js",
52-
"/js/compiled-calendar-component.3.7.2.min.js": "/js/compiled-calendar-component.3.7.2.min.js",
53-
"/js/compiled-table-component.3.7.2.min.js": "/js/compiled-table-component.3.7.2.min.js",
54-
"/js/compiled-tiptap-toolbar.3.7.2.min.js": "/js/compiled-tiptap-toolbar.3.7.2.min.js",
55-
"/js/compiled-tiptap-tests.3.7.2.min.js": "/js/compiled-tiptap-tests.3.7.2.min.js",
56-
"/js/compiled-gantt-component.3.7.2.min.js": "/js/compiled-gantt-component.3.7.2.min.js",
57-
"/js/compiled-chart-component.3.7.2.min.js": "/js/compiled-chart-component.3.7.2.min.js",
58-
"/css/tiptap-editor.3.7.2.min.css": "/css/tiptap-editor.3.7.2.min.css",
54+
"/css/app.3.7.3.min.css": "/css/app.3.7.3.min.css",
55+
"/js/compiled-footer.3.7.3.min.js": "/js/compiled-footer.3.7.3.min.js",
56+
"/js/compiled-app.3.7.3.min.js": "/js/compiled-app.3.7.3.min.js",
57+
"/js/compiled-frameworks.3.7.3.min.js": "/js/compiled-frameworks.3.7.3.min.js",
58+
"/js/compiled-framework-plugins.3.7.3.min.js": "/js/compiled-framework-plugins.3.7.3.min.js",
59+
"/js/compiled-global-component.3.7.3.min.js": "/js/compiled-global-component.3.7.3.min.js",
60+
"/js/compiled-calendar-component.3.7.3.min.js": "/js/compiled-calendar-component.3.7.3.min.js",
61+
"/js/compiled-table-component.3.7.3.min.js": "/js/compiled-table-component.3.7.3.min.js",
62+
"/js/compiled-tiptap-toolbar.3.7.3.min.js": "/js/compiled-tiptap-toolbar.3.7.3.min.js",
63+
"/js/compiled-tiptap-tests.3.7.3.min.js": "/js/compiled-tiptap-tests.3.7.3.min.js",
64+
"/js/compiled-gantt-component.3.7.3.min.js": "/js/compiled-gantt-component.3.7.3.min.js",
65+
"/js/compiled-chart-component.3.7.3.min.js": "/js/compiled-chart-component.3.7.3.min.js",
66+
"/css/tiptap-editor.3.7.3.min.css": "/css/tiptap-editor.3.7.3.min.css",
5967
"/images/03-1.png": "/images/03-1.png",
6068
"/images/32px.png": "/images/32px.png",
6169
"/images/40px.png": "/images/40px.png",

0 commit comments

Comments
 (0)
⚡