From a5e8eb64d6b2cabfb77489678f8ebb2fd5892767 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 12 Nov 2025 15:43:38 -0800 Subject: [PATCH 1/3] Use NVARCHAR instead of text for unicode characters --- core/module.properties | 26 +++++++++---------- .../postgresql/core-25.007-25.008.sql | 1 + .../sqlserver/core-25.007-25.008.sql | 1 + 3 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 core/resources/schemas/dbscripts/postgresql/core-25.007-25.008.sql create mode 100644 core/resources/schemas/dbscripts/sqlserver/core-25.007-25.008.sql diff --git a/core/module.properties b/core/module.properties index ff121b5d05a..bab6fe4c001 100644 --- a/core/module.properties +++ b/core/module.properties @@ -1,13 +1,13 @@ -Name: Core -ModuleClass: org.labkey.core.CoreModule -SchemaVersion: 25.007 -Label: Administration and Essential Services -Description: The Core module provides central services such as login, \ - security, administration, folder management, user management, \ - module upgrade, file attachments, analytics, and portal page management. -Organization: LabKey -OrganizationURL: https://www.labkey.com/ -License: Apache 2.0 -LicenseURL: http://www.apache.org/licenses/LICENSE-2.0 -SupportedDatabases: mssql, pgsql -ManageVersion: true +Name: Core +ModuleClass: org.labkey.core.CoreModule +SchemaVersion: 25.008 +Label: Administration and Essential Services +Description: The Core module provides central services such as login, \ + security, administration, folder management, user management, \ + module upgrade, file attachments, analytics, and portal page management. +Organization: LabKey +OrganizationURL: https://www.labkey.com/ +License: Apache 2.0 +LicenseURL: http://www.apache.org/licenses/LICENSE-2.0 +SupportedDatabases: mssql, pgsql +ManageVersion: true diff --git a/core/resources/schemas/dbscripts/postgresql/core-25.007-25.008.sql b/core/resources/schemas/dbscripts/postgresql/core-25.007-25.008.sql new file mode 100644 index 00000000000..f2d600cd859 --- /dev/null +++ b/core/resources/schemas/dbscripts/postgresql/core-25.007-25.008.sql @@ -0,0 +1 @@ +-- no op, changeset for version tracking only. core.Report.DescriptorXML TEXT type is already sufficient \ No newline at end of file diff --git a/core/resources/schemas/dbscripts/sqlserver/core-25.007-25.008.sql b/core/resources/schemas/dbscripts/sqlserver/core-25.007-25.008.sql new file mode 100644 index 00000000000..00a6b8a75c5 --- /dev/null +++ b/core/resources/schemas/dbscripts/sqlserver/core-25.007-25.008.sql @@ -0,0 +1 @@ +ALTER TABLE core.Report ALTER COLUMN DescriptorXML NVARCHAR(MAX); \ No newline at end of file From 31603ef2cf84ff049ae8cead060e94e40e104137 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 12 Nov 2025 15:44:08 -0800 Subject: [PATCH 2/3] crlf --- core/module.properties | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/core/module.properties b/core/module.properties index bab6fe4c001..2fea53eff00 100644 --- a/core/module.properties +++ b/core/module.properties @@ -1,13 +1,13 @@ -Name: Core -ModuleClass: org.labkey.core.CoreModule -SchemaVersion: 25.008 -Label: Administration and Essential Services -Description: The Core module provides central services such as login, \ - security, administration, folder management, user management, \ - module upgrade, file attachments, analytics, and portal page management. -Organization: LabKey -OrganizationURL: https://www.labkey.com/ -License: Apache 2.0 -LicenseURL: http://www.apache.org/licenses/LICENSE-2.0 -SupportedDatabases: mssql, pgsql -ManageVersion: true +Name: Core +ModuleClass: org.labkey.core.CoreModule +SchemaVersion: 25.008 +Label: Administration and Essential Services +Description: The Core module provides central services such as login, \ + security, administration, folder management, user management, \ + module upgrade, file attachments, analytics, and portal page management. +Organization: LabKey +OrganizationURL: https://www.labkey.com/ +License: Apache 2.0 +LicenseURL: http://www.apache.org/licenses/LICENSE-2.0 +SupportedDatabases: mssql, pgsql +ManageVersion: true From cfd39d37556edc43b35048cb9a53dcb03f245b35 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 12 Nov 2025 19:09:42 -0800 Subject: [PATCH 3/3] code review changes --- .../schemas/dbscripts/postgresql/core-25.007-25.008.sql | 1 - 1 file changed, 1 deletion(-) delete mode 100644 core/resources/schemas/dbscripts/postgresql/core-25.007-25.008.sql diff --git a/core/resources/schemas/dbscripts/postgresql/core-25.007-25.008.sql b/core/resources/schemas/dbscripts/postgresql/core-25.007-25.008.sql deleted file mode 100644 index f2d600cd859..00000000000 --- a/core/resources/schemas/dbscripts/postgresql/core-25.007-25.008.sql +++ /dev/null @@ -1 +0,0 @@ --- no op, changeset for version tracking only. core.Report.DescriptorXML TEXT type is already sufficient \ No newline at end of file