From b2cbb5aa87a84d58857b8c0aee809060e4ec62ab Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 13 Nov 2019 09:57:03 -0800 Subject: [PATCH 1/2] Issue 35805: MS SQL Group Concat Install function fails on AWS RDS Instances as install script tries to perform operations that are not allowed in AWS RDS Service --- .../sqlserver/Naturalize_install_1.0.1.sql | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/LDK/resources/schemas/dbscripts/sqlserver/Naturalize_install_1.0.1.sql b/LDK/resources/schemas/dbscripts/sqlserver/Naturalize_install_1.0.1.sql index 418fe420..6ec7af8c 100644 --- a/LDK/resources/schemas/dbscripts/sqlserver/Naturalize_install_1.0.1.sql +++ b/LDK/resources/schemas/dbscripts/sqlserver/Naturalize_install_1.0.1.sql @@ -9,18 +9,7 @@ SET NOCOUNT ON ; GO -------------------------------------------------------------------------------------------------------------------------------- --- Turn advanced options on -EXEC sys.sp_configure @configname = 'show advanced options', @configvalue = 1 ; -GO -RECONFIGURE WITH OVERRIDE ; -GO --- Enable CLR -EXEC sys.sp_configure @configname = 'clr enabled', @configvalue = 1 ; -GO -RECONFIGURE WITH OVERRIDE ; -GO - +@@ENABLE_CLR_STATEMENTS@@ -- Add trusted assembly if we are running on SQLServer 2017 IF OBJECT_ID(N'sys.trusted_assemblies', N'V') IS NOT NULL BEGIN From 9f39debf0ada64f13e0c1ca6b98358c0ea507685 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Wed, 13 Nov 2019 11:31:01 -0800 Subject: [PATCH 2/2] Provide mechanism for modules to indicate scripts that should be ignored Log whether we think we're executing against RDS or not --- LDK/resources/schemas/dbscripts/sqlserver/ignored_scripts.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 LDK/resources/schemas/dbscripts/sqlserver/ignored_scripts.txt diff --git a/LDK/resources/schemas/dbscripts/sqlserver/ignored_scripts.txt b/LDK/resources/schemas/dbscripts/sqlserver/ignored_scripts.txt new file mode 100644 index 00000000..a397dbaa --- /dev/null +++ b/LDK/resources/schemas/dbscripts/sqlserver/ignored_scripts.txt @@ -0,0 +1,2 @@ +Naturalize_install_1.0.1.sql +Naturalize_uninstall.sql \ No newline at end of file