From 50eae904e41c6283d7498255ec2a198f2e892f68 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Tue, 4 Feb 2025 20:42:10 +0000 Subject: [PATCH] Adjust setup.sh file to work with inline go statements --- .../dbo_schema_database_statements.sql | 4 +-- .../fp_schema_database_statements.sql | 0 .../fw_schema_database_statements.sql | 0 .../int_schema_database_statements.sql | 0 .../ob_schema_database_statements.sql | 0 .../dbo_schema_database_statements_small.sql | 4 +++ .../fp_schema_database_statements_small.sql | 3 ++ .../fw_schema_database_statements_small.sql | 3 ++ .../int_schema_database_statements_small.sql | 3 ++ .../ob_schema_database_statements_small.sql | 3 ++ .../infrastructure/sql-server/setup.sh | 29 +++++++++++++++---- 11 files changed, 40 insertions(+), 9 deletions(-) rename ef-migration/infrastructure/sql-server/{schemas => full_schemas}/dbo_schema_database_statements.sql (99%) rename ef-migration/infrastructure/sql-server/{schemas => full_schemas}/fp_schema_database_statements.sql (100%) rename ef-migration/infrastructure/sql-server/{schemas => full_schemas}/fw_schema_database_statements.sql (100%) rename ef-migration/infrastructure/sql-server/{schemas => full_schemas}/int_schema_database_statements.sql (100%) rename ef-migration/infrastructure/sql-server/{schemas => full_schemas}/ob_schema_database_statements.sql (100%) diff --git a/ef-migration/infrastructure/sql-server/schemas/dbo_schema_database_statements.sql b/ef-migration/infrastructure/sql-server/full_schemas/dbo_schema_database_statements.sql similarity index 99% rename from ef-migration/infrastructure/sql-server/schemas/dbo_schema_database_statements.sql rename to ef-migration/infrastructure/sql-server/full_schemas/dbo_schema_database_statements.sql index a1abf15..eeba30a 100644 --- a/ef-migration/infrastructure/sql-server/schemas/dbo_schema_database_statements.sql +++ b/ef-migration/infrastructure/sql-server/full_schemas/dbo_schema_database_statements.sql @@ -1047,7 +1047,6 @@ CREATE TABLE [dbo].[ColumnStoreIndex] ( [i] int NOT NULL ); -CREATE NONCLUSTERED COLUMNSTORE INDEX [nccx_ColumnStoreIndex] ON [dbo].[ColumnStoreIndex] () INCLUDE ([i]); GO --------------------------------------------- @@ -12815,7 +12814,6 @@ CREATE TABLE [dbo].[WFHistory] ( PRIMARY KEY ([WorkflowHistoryGUID]) ); -CREATE NONCLUSTERED COLUMNSTORE INDEX [NCCNU_WorkflowHistoryGUID] ON [dbo].[WFHistory] () INCLUDE ([WorkflowHistoryGUID]); GO ALTER TABLE [dbo].[WFHistory] ADD CONSTRAINT [FK_WFHistory_WFWorkflowMap] FOREIGN KEY ([WorkflowMapGUID]) REFERENCES [dbo].[WFWorkflowMap] ([WorkflowMapGUID]); GO ALTER TABLE [dbo].[WFHistory] ADD CONSTRAINT [FK_WFHistory_WFWorkflowStep] FOREIGN KEY ([WorkflowStepGUID]) REFERENCES [dbo].[WFWorkflowStep] ([WorkflowStepGUID]); GO @@ -13526,7 +13524,7 @@ CREATE TABLE [dbo].[dtproperties] ( [property] varchar(64) NOT NULL, [value] varchar(255) NULL, [uvalue] nvarchar(255) NULL, - [lvalue] image(2147483647) NULL, + [lvalue] image NULL, [version] int NOT NULL, PRIMARY KEY ([id], [property]) ); diff --git a/ef-migration/infrastructure/sql-server/schemas/fp_schema_database_statements.sql b/ef-migration/infrastructure/sql-server/full_schemas/fp_schema_database_statements.sql similarity index 100% rename from ef-migration/infrastructure/sql-server/schemas/fp_schema_database_statements.sql rename to ef-migration/infrastructure/sql-server/full_schemas/fp_schema_database_statements.sql diff --git a/ef-migration/infrastructure/sql-server/schemas/fw_schema_database_statements.sql b/ef-migration/infrastructure/sql-server/full_schemas/fw_schema_database_statements.sql similarity index 100% rename from ef-migration/infrastructure/sql-server/schemas/fw_schema_database_statements.sql rename to ef-migration/infrastructure/sql-server/full_schemas/fw_schema_database_statements.sql diff --git a/ef-migration/infrastructure/sql-server/schemas/int_schema_database_statements.sql b/ef-migration/infrastructure/sql-server/full_schemas/int_schema_database_statements.sql similarity index 100% rename from ef-migration/infrastructure/sql-server/schemas/int_schema_database_statements.sql rename to ef-migration/infrastructure/sql-server/full_schemas/int_schema_database_statements.sql diff --git a/ef-migration/infrastructure/sql-server/schemas/ob_schema_database_statements.sql b/ef-migration/infrastructure/sql-server/full_schemas/ob_schema_database_statements.sql similarity index 100% rename from ef-migration/infrastructure/sql-server/schemas/ob_schema_database_statements.sql rename to ef-migration/infrastructure/sql-server/full_schemas/ob_schema_database_statements.sql diff --git a/ef-migration/infrastructure/sql-server/schemas/dbo_schema_database_statements_small.sql b/ef-migration/infrastructure/sql-server/schemas/dbo_schema_database_statements_small.sql index eb359e5..7b675a2 100644 --- a/ef-migration/infrastructure/sql-server/schemas/dbo_schema_database_statements_small.sql +++ b/ef-migration/infrastructure/sql-server/schemas/dbo_schema_database_statements_small.sql @@ -8,6 +8,9 @@ --------------------------------------------- -- dbo.AMAssumptionView ------------------ --------------------------------------------- +DROP TABLE [dbo].[AMAssumptionView]; +GO + CREATE TABLE [dbo].[AMAssumptionView] ( [AssumptionViewGUID] uniqueidentifier NOT NULL, [AssumptionGroupGUID] uniqueidentifier NOT NULL, @@ -36,3 +39,4 @@ ALTER TABLE [dbo].[AMAssumptionView] ADD CONSTRAINT [DF_AMAssumptionView_FOLDERG ALTER TABLE [dbo].[AMAssumptionView] ADD CONSTRAINT [DF_AMAssumptionView_ISDISTRIBUTIONMODEACTIVE] DEFAULT ((0)) FOR [IsDistributionModeActive]; GO ALTER TABLE [dbo].[AMAssumptionView] ADD CONSTRAINT [DF_AMAssumptionView_DISTRIBUTIONINFOXML] DEFAULT ('') FOR [DistributionInfo]; GO ALTER TABLE [dbo].[AMAssumptionView] ADD CONSTRAINT [DF_AMAssumptionView_PROVIDERGUID] DEFAULT ('00000000-0000-0000-0000-000000000000') FOR [ProviderGUID]; GO + diff --git a/ef-migration/infrastructure/sql-server/schemas/fp_schema_database_statements_small.sql b/ef-migration/infrastructure/sql-server/schemas/fp_schema_database_statements_small.sql index fc7d130..31b867b 100644 --- a/ef-migration/infrastructure/sql-server/schemas/fp_schema_database_statements_small.sql +++ b/ef-migration/infrastructure/sql-server/schemas/fp_schema_database_statements_small.sql @@ -8,6 +8,9 @@ --------------------------------------------- -- fp.APAdminPerformanceTest ------------------ --------------------------------------------- +DROP TABLE [fp].[APAdminPerformanceTest]; +GO + CREATE TABLE [fp].[APAdminPerformanceTest] ( [TestID] uniqueidentifier NOT NULL, [SortOrder] int NOT NULL, diff --git a/ef-migration/infrastructure/sql-server/schemas/fw_schema_database_statements_small.sql b/ef-migration/infrastructure/sql-server/schemas/fw_schema_database_statements_small.sql index 89f581c..510088c 100644 --- a/ef-migration/infrastructure/sql-server/schemas/fw_schema_database_statements_small.sql +++ b/ef-migration/infrastructure/sql-server/schemas/fw_schema_database_statements_small.sql @@ -8,6 +8,9 @@ --------------------------------------------- -- fw.ABBBudgetedCostPerRVU ------------------ --------------------------------------------- +DROP TABLE [fw].[ABBBudgetedCostPerRVU]; +GO + CREATE TABLE [fw].[ABBBudgetedCostPerRVU] ( [DepartmentID] int NOT NULL, [AccountID] int NOT NULL, diff --git a/ef-migration/infrastructure/sql-server/schemas/int_schema_database_statements_small.sql b/ef-migration/infrastructure/sql-server/schemas/int_schema_database_statements_small.sql index 872b1ac..6ce75ad 100644 --- a/ef-migration/infrastructure/sql-server/schemas/int_schema_database_statements_small.sql +++ b/ef-migration/infrastructure/sql-server/schemas/int_schema_database_statements_small.sql @@ -8,6 +8,9 @@ --------------------------------------------- -- int.AggregatePostDIHistory ------------------ --------------------------------------------- +DROP TABLE [int].[AggregatePostDIHistory]; +GO + CREATE TABLE [int].[AggregatePostDIHistory] ( [AggregatePostDIHistoryGuid] uniqueidentifier NOT NULL, [CreatedAtUtc] datetime NOT NULL, diff --git a/ef-migration/infrastructure/sql-server/schemas/ob_schema_database_statements_small.sql b/ef-migration/infrastructure/sql-server/schemas/ob_schema_database_statements_small.sql index edf38ce..43c249c 100644 --- a/ef-migration/infrastructure/sql-server/schemas/ob_schema_database_statements_small.sql +++ b/ef-migration/infrastructure/sql-server/schemas/ob_schema_database_statements_small.sql @@ -8,6 +8,9 @@ --------------------------------------------- -- ob.AccountVariabilityOverride ------------------ --------------------------------------------- +DROP TABLE [ob].[AccountVariabilityOverride]; +GO + CREATE TABLE [ob].[AccountVariabilityOverride] ( [AccountVariabilityOverrideID] int NOT NULL, [DepartmentAssignment] nvarchar(800) NOT NULL, diff --git a/ef-migration/infrastructure/sql-server/setup.sh b/ef-migration/infrastructure/sql-server/setup.sh index e3a732a..9e5d456 100644 --- a/ef-migration/infrastructure/sql-server/setup.sh +++ b/ef-migration/infrastructure/sql-server/setup.sh @@ -21,9 +21,17 @@ do fi done +# Create st-database if it doesn't exist +echo "Creating st-database if it doesn't exist..." +sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q "IF NOT EXISTS (SELECT * FROM sys.databases WHERE name = 'st-database') CREATE DATABASE [st-database]" +if [ $? -ne 0 ]; then + echo "Error creating database" + exit 1 +fi + # Run the initialization script echo "Running initialization script..." -sqlcmd -S localhost -U sa -P $SA_PASSWORD -i /usr/src/app/init.sql +sqlcmd -S localhost -U sa -P $SA_PASSWORD -d st-database -i /usr/src/app/init.sql if [ $? -ne 0 ]; then echo "Error executing initialization script" exit 1 @@ -34,14 +42,23 @@ echo "Running schema scripts..." for f in /usr/src/app/schemas/*.sql do echo "Processing $f..." - sqlcmd -S localhost -U sa -P $SA_PASSWORD -i "$f" -b + + # Create a temporary file + temp_file=$(mktemp) + + # Process the file: add newlines around GO statements + sed 's/GO/\nGO\n/g' "$f" > "$temp_file" + + # Execute the processed file + sqlcmd -S localhost -U sa -P $SA_PASSWORD -d st-database -i "$temp_file" if [ $? -ne 0 ]; then - echo "Error executing schema script $f" - exit 1 + echo "Warning: Script $f had some errors but continuing..." + rm "$temp_file" # Clean up temp file + continue fi - # Verify schema creation - sqlcmd -S localhost -U sa -P $SA_PASSWORD -Q "SELECT name FROM sys.schemas WHERE name IN ('fp', 'fw', 'int', 'ob')" -h -1 + # Clean up temp file + rm "$temp_file" done echo "All scripts executed. SQL Server is ready."