Merge pull request #49 from Microsoft/jodebrui

fixes in wwi scripts

Author: jodebrui

.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
+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

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;

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]

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,
@@ -4638,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;
 
@@ -6137,9 +6136,6 @@ BEGIN
 END;
 GO
 
-USE tempdb;
-GO
-
 /*
 
 -- initial data population to ship date

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
-
-

samples/databases/wide-world-importers/wwi-database-scripts/6-wwi-data-simulation.sql

@@ -5,6 +5,6 @@ GO
 
 SET NOCOUNT ON;
 
-EXECUTE Application.Configuration_ConfigureForEnterpriseEdition
+EXECUTE [Application].Configuration_ConfigureForEnterpriseEdition
 GO
 

samples/databases/wide-world-importers/wwi-database-scripts/7-wwi-enable-full-features.sql

@@ -1,5 +1,3 @@
--- Recreate database - this script is generated in step 2
-
 USE master;
 
 IF EXISTS(SELECT 1 FROM sys.databases WHERE name = N'WideWorldImportersDW')
@@ -10,12 +8,39 @@ END;
 GO
 
 CREATE DATABASE WideWorldImportersDW
+ON PRIMARY
+(
+    NAME = WWI_Primary,
+    FILENAME = 'D:\Data\WideWorldImportersDW.mdf',
+    SIZE = 2GB,
+    MAXSIZE = UNLIMITED,
+    FILEGROWTH = 64MB
+),
+FILEGROUP USERDATA DEFAULT
+(
+    NAME = WWI_UserData,
+    FILENAME = 'D:\Data\WideWorldImportersDW_UserData.ndf',
+    SIZE = 2GB,
+    MAXSIZE = UNLIMITED,
+    FILEGROWTH = 64MB
+)
+LOG ON
+(
+    NAME = WWI_Log,
+    FILENAME = 'E:\Log\WideWorldImportersDW.ldf',
+    SIZE = 100MB,
+    MAXSIZE = UNLIMITED,
+    FILEGROWTH = 64MB
+)
 COLLATE Latin1_General_100_CI_AS;
 GO
 
 ALTER DATABASE WideWorldImportersDW SET RECOVERY SIMPLE;
 GO
 
+ALTER DATABASE WideWorldImporters SET AUTO_UPDATE_STATISTICS_ASYNC ON;
+GO
+ 
 ALTER AUTHORIZATION ON DATABASE::WideWorldImportersDW to sa;
 GO