From 91d954497ceb4fd3e58e36d208ba0bd612be3813 Mon Sep 17 00:00:00 2001 From: Jos de Bruijn Date: Thu, 2 Jun 2016 12:29:56 -0700 Subject: [PATCH 1/2] fixes in scripts --- .gitignore | 9 +++- ...onstruct-database-from-metadata-tables.sql | 4 +- .../wwi-database-scripts/3-wwi-recreate.sql | 45 +++++++++++++++++- ...wi-configure-required-database-objects.sql | 6 +-- .../5-wwi-load-seed-data.sql | 4 -- .../6-wwi-data-simulation.sql | Bin 1328 -> 1252 bytes .../7-wwi-enable-full-features.sql | 2 +- .../3-wwi-dw-recreate.sql | 29 ++++++++++- .../6-wwi-dw-enable-full-features.sql | Bin 430 -> 434 bytes 9 files changed, 83 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 79d24733d0..254d5795d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ samples/in-memory/ticket-reservations/DemoWorkload/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs *.nupkg -samples/in-memory/ticket-reservations/packages/CircularGauge.1.0.0/CreatePackageFile.bat \ No newline at end of file +samples/in-memory/ticket-reservations/packages/CircularGauge.1.0.0/CreatePackageFile.bat +*.suo +samples/databases/wide-world-importers/sample-scripts/always-encrypted/PopulateAlwaysEncryptedData/bin/Debug/PopulateAlwaysEncryptedData.exe +*.pdb +samples/databases/wide-world-importers/sample-scripts/always-encrypted/PopulateAlwaysEncryptedData/bin/Debug/PopulateAlwaysEncryptedData.vshost.exe +*.Cache +samples/databases/wide-world-importers/sample-scripts/always-encrypted/PopulateAlwaysEncryptedData/bin/Debug/PopulateAlwaysEncryptedData.exe.config +samples/databases/wide-world-importers/sample-scripts/always-encrypted/PopulateAlwaysEncryptedData/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs \ No newline at end of file diff --git a/samples/databases/wide-world-importers/wwi-database-scripts/2-wwi-construct-database-from-metadata-tables.sql b/samples/databases/wide-world-importers/wwi-database-scripts/2-wwi-construct-database-from-metadata-tables.sql index 0ab4fd023e..c652d8294a 100644 --- a/samples/databases/wide-world-importers/wwi-database-scripts/2-wwi-construct-database-from-metadata-tables.sql +++ b/samples/databases/wide-world-importers/wwi-database-scripts/2-wwi-construct-database-from-metadata-tables.sql @@ -359,8 +359,8 @@ BEGIN SET @SQL += @CrLf + N'WITH ' + @CrLf + N'(' + @CrLf + @Indent + N'SYSTEM_VERSIONING = ON (HISTORY_TABLE = ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + N')' + @CrLf - + N');' + @CrLf; - + N'ALTER INDEX ix_' + @TableName + N'_' + @TemporalTableSuffix + N'ON ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + N' REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE)' + + N');' + @CrLf + + N'ALTER INDEX ix_' + @TableName + N'_' + @TemporalTableSuffix + N' ON ' + QUOTENAME(@SchemaName) + N'.' + QUOTENAME(@TableName + N'_' + @TemporalTableSuffix) + N' REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE)'; END; SET @SQL += N';' + @CrLf + @GO; diff --git a/samples/databases/wide-world-importers/wwi-database-scripts/3-wwi-recreate.sql b/samples/databases/wide-world-importers/wwi-database-scripts/3-wwi-recreate.sql index b6bb244327..4ebebd2b84 100644 --- a/samples/databases/wide-world-importers/wwi-database-scripts/3-wwi-recreate.sql +++ b/samples/databases/wide-world-importers/wwi-database-scripts/3-wwi-recreate.sql @@ -8,13 +8,39 @@ END; GO CREATE DATABASE WideWorldImporters - +ON PRIMARY +( + NAME = WWI_Primary, + FILENAME = 'D:\Data\WideWorldImporters.mdf', + SIZE = 1GB, + MAXSIZE = UNLIMITED, + FILEGROWTH = 64MB +), +FILEGROUP USERDATA DEFAULT +( + NAME = WWI_UserData, + FILENAME = 'D:\Data\WideWorldImporters_UserData.ndf', + SIZE = 2GB, + MAXSIZE = UNLIMITED, + FILEGROWTH = 64MB +) +LOG ON +( + NAME = WWI_Log, + FILENAME = 'E:\Log\WideWorldImporters.ldf', + SIZE = 100MB, + MAXSIZE = UNLIMITED, + FILEGROWTH = 64MB +) COLLATE Latin1_General_100_CI_AS; GO ALTER DATABASE WideWorldImporters SET RECOVERY SIMPLE; GO +ALTER DATABASE WideWorldImporters SET AUTO_UPDATE_STATISTICS_ASYNC ON; +GO + ALTER AUTHORIZATION ON DATABASE::WideWorldImporters to sa; GO @@ -148,6 +174,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Application].[People_Archive]) ); +ALTER INDEX ix_People_Archive ON [Application].[People_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO CREATE INDEX [IX_Application_People_IsEmployee] @@ -212,6 +239,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Warehouse].[ColdRoomTemperatures_Archive]) ); +ALTER INDEX ix_ColdRoomTemperatures_Archive ON [Warehouse].[ColdRoomTemperatures_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Regularly recorded temperatures of cold room chillers', @level0type = N'SCHEMA', @level0name = 'Warehouse', @level1type = N'TABLE', @level1name = 'ColdRoomTemperatures'; @@ -277,6 +305,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Application].[Countries_Archive]) ); +ALTER INDEX ix_Countries_Archive ON [Application].[Countries_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Countries that contain the states or provinces (including geographic boundaries)', @level0type = N'SCHEMA', @level0name = 'Application', @level1type = N'TABLE', @level1name = 'Countries'; @@ -313,6 +342,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Application].[DeliveryMethods_Archive]) ); +ALTER INDEX ix_DeliveryMethods_Archive ON [Application].[DeliveryMethods_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Ways that stock items can be delivered (ie: truck/van, post, pickup, courier, etc.', @level0type = N'SCHEMA', @level0name = 'Application', @level1type = N'TABLE', @level1name = 'DeliveryMethods'; @@ -340,6 +370,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Application].[PaymentMethods_Archive]) ); +ALTER INDEX ix_PaymentMethods_Archive ON [Application].[PaymentMethods_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Ways that payments can be made (ie: cash, check, EFT, etc.', @level0type = N'SCHEMA', @level0name = 'Application', @level1type = N'TABLE', @level1name = 'PaymentMethods'; @@ -367,6 +398,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Application].[TransactionTypes_Archive]) ); +ALTER INDEX ix_TransactionTypes_Archive ON [Application].[TransactionTypes_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Types of customer, supplier, or stock transactions (ie: invoice, credit note, etc.)', @level0type = N'SCHEMA', @level0name = 'Application', @level1type = N'TABLE', @level1name = 'TransactionTypes'; @@ -394,6 +426,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Purchasing].[SupplierCategories_Archive]) ); +ALTER INDEX ix_SupplierCategories_Archive ON [Purchasing].[SupplierCategories_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Categories for suppliers (ie novelties, toys, clothing, packaging, etc.)', @level0type = N'SCHEMA', @level0name = 'Purchasing', @level1type = N'TABLE', @level1name = 'SupplierCategories'; @@ -421,6 +454,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Sales].[BuyingGroups_Archive]) ); +ALTER INDEX ix_BuyingGroups_Archive ON [Sales].[BuyingGroups_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Customer organizations can be part of groups that exert greater buying power', @level0type = N'SCHEMA', @level0name = 'Sales', @level1type = N'TABLE', @level1name = 'BuyingGroups'; @@ -448,6 +482,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Sales].[CustomerCategories_Archive]) ); +ALTER INDEX ix_CustomerCategories_Archive ON [Sales].[CustomerCategories_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Categories for customers (ie restaurants, cafes, supermarkets, etc.)', @level0type = N'SCHEMA', @level0name = 'Sales', @level1type = N'TABLE', @level1name = 'CustomerCategories'; @@ -475,6 +510,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Warehouse].[Colors_Archive]) ); +ALTER INDEX ix_Colors_Archive ON [Warehouse].[Colors_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Stock items can (optionally) have colors', @level0type = N'SCHEMA', @level0name = 'Warehouse', @level1type = N'TABLE', @level1name = 'Colors'; @@ -502,6 +538,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Warehouse].[PackageTypes_Archive]) ); +ALTER INDEX ix_PackageTypes_Archive ON [Warehouse].[PackageTypes_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Ways that stock items can be packaged (ie: each, box, carton, pallet, kg, etc.', @level0type = N'SCHEMA', @level0name = 'Warehouse', @level1type = N'TABLE', @level1name = 'PackageTypes'; @@ -529,6 +566,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Warehouse].[StockGroups_Archive]) ); +ALTER INDEX ix_StockGroups_Archive ON [Warehouse].[StockGroups_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO EXEC sys.sp_addextendedproperty @name = N'Description', @value = N'Groups for categorizing stock items (ie: novelties, toys, edible novelties, etc.)', @level0type = N'SCHEMA', @level0name = 'Warehouse', @level1type = N'TABLE', @level1name = 'StockGroups'; @@ -563,6 +601,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Application].[StateProvinces_Archive]) ); +ALTER INDEX ix_StateProvinces_Archive ON [Application].[StateProvinces_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO CREATE INDEX [FK_Application_StateProvinces_CountryID] @@ -610,6 +649,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Application].[Cities_Archive]) ); +ALTER INDEX ix_Cities_Archive ON [Application].[Cities_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO CREATE INDEX [FK_Application_Cities_StateProvinceID] @@ -733,6 +773,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Purchasing].[Suppliers_Archive]) ); +ALTER INDEX ix_Suppliers_Archive ON [Purchasing].[Suppliers_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO CREATE INDEX [FK_Purchasing_Suppliers_SupplierCategoryID] @@ -866,6 +907,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Sales].[Customers_Archive]) ); +ALTER INDEX ix_Customers_Archive ON [Sales].[Customers_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO CREATE INDEX [FK_Sales_Customers_CustomerCategoryID] @@ -1102,6 +1144,7 @@ WITH ( SYSTEM_VERSIONING = ON (HISTORY_TABLE = [Warehouse].[StockItems_Archive]) ); +ALTER INDEX ix_StockItems_Archive ON [Warehouse].[StockItems_Archive] REBUILD PARTITION = ALL WITH (DATA_COMPRESSION = NONE); GO CREATE INDEX [FK_Warehouse_StockItems_SupplierID] diff --git a/samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql b/samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql index 1007f22810..6d41707916 100644 --- a/samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql +++ b/samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql @@ -4010,8 +4010,7 @@ EXEC dbo.sp_rename @objname = N''Warehouse.VehicleTemperatures'', SET @SQL = N' CREATE TABLE Warehouse.VehicleTemperatures ( - VehicleTemperatureID bigint IDENTITY(1,1) NOT NULL - PRIMARY KEY NONCLUSTERED, + VehicleTemperatureID bigint IDENTITY(1,1) NOT NULL, VehicleRegistration nvarchar(20) COLLATE Latin1_General_CI_AS NOT NULL, ChillerSensorNumber int NOT NULL, RecordedWhen datetime2(7) NOT NULL, @@ -6137,9 +6136,6 @@ BEGIN END; GO -USE tempdb; -GO - /* -- initial data population to ship date diff --git a/samples/databases/wide-world-importers/wwi-database-scripts/5-wwi-load-seed-data.sql b/samples/databases/wide-world-importers/wwi-database-scripts/5-wwi-load-seed-data.sql index 0927cfa314..9a837ccde5 100644 --- a/samples/databases/wide-world-importers/wwi-database-scripts/5-wwi-load-seed-data.sql +++ b/samples/databases/wide-world-importers/wwi-database-scripts/5-wwi-load-seed-data.sql @@ -59121,7 +59121,3 @@ GO EXEC Sequences.ReseedAllSequences; GO -USE tempdb; -GO - - diff --git a/samples/databases/wide-world-importers/wwi-database-scripts/6-wwi-data-simulation.sql b/samples/databases/wide-world-importers/wwi-database-scripts/6-wwi-data-simulation.sql index 64db4f50b788cb22af6a5606c18ac9036e8592e6..5c4972a0f87e26de2d8dc318c20fbba81df49d11 100644 GIT binary patch delta 42 vcmdnM^@MXm1Ea~r#?Hx~SX3sTV3C_##25r-^D!-9HDxenFxq841zE Date: Thu, 2 Jun 2016 12:35:13 -0700 Subject: [PATCH 2/2] fix --- .../4-wwi-configure-required-database-objects.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql b/samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql index 6d41707916..4f90945a68 100644 --- a/samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql +++ b/samples/databases/wide-world-importers/wwi-database-scripts/4-wwi-configure-required-database-objects.sql @@ -4637,7 +4637,7 @@ ALL TO ([USERDATA]);'; SET @SQL = N' CREATE PARTITION SCHEME PS_TransactionDate AS PARTITION PF_TransactionDate -ALL TO ([USERDATA]]);'; +ALL TO ([USERDATA]);'; EXECUTE (@SQL); END;