From 6f666364688483a1667fbd5ddfd2f7677bd5225a Mon Sep 17 00:00:00 2001 From: Jos de Bruijn Date: Wed, 8 Jun 2016 09:59:14 -0700 Subject: [PATCH] fix for Azure --- .gitignore | 3 ++- .../4-wwi-configure-required-database-objects.sql | 14 +++++--------- ...-wwi-dw-configure-required-database-objects.sql | 1 - 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index fcee0a89..931773c9 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,5 @@ samples/features/in-memory/ticket-reservations/DemoWorkload/bin/Release/DemoWork samples/databases/wide-world-importers/sample-scripts/always-encrypted/PopulateAlwaysEncryptedData/obj/Debug/PopulateAlwaysEncryptedData.csproj.FileListAbsolute.txt samples/databases/wide-world-importers/sample-scripts/always-encrypted/PopulateAlwaysEncryptedData/bin/Debug/PopulateAlwaysEncryptedData.vshost.exe.config *.zip -samples/features/in-memory/ticket-reservations/packages/CircularGauge.1.0.0/CreatePackageFile.bat \ No newline at end of file +samples/features/in-memory/ticket-reservations/packages/CircularGauge.1.0.0/CreatePackageFile.bat +samples/features/in-memory/ticket-reservations/TicketReservations/TicketReservations.dbmdl \ No newline at end of file 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 bb1387e5..1e2ef172 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 @@ -3900,7 +3900,6 @@ DROP PROCEDURE IF EXISTS [Application].Configuration_EnableInMemory; GO CREATE PROCEDURE [Application].Configuration_EnableInMemory -WITH EXECUTE AS OWNER AS BEGIN SET NOCOUNT ON; @@ -4999,10 +4998,7 @@ BEGIN EXEC [Application].[Configuration_ApplyColumnstoreIndexing]; - IF SERVERPROPERTY(N'IsFullTextInstalled') = 0 - BEGIN - EXEC [Application].[Configuration_ApplyFullTextIndexing]; - END; + EXEC [Application].[Configuration_ApplyFullTextIndexing]; EXEC [Application].[Configuration_EnableInMemory]; @@ -6161,8 +6157,8 @@ GO -- initial data population to ship date -EXEC WideWorldImporters.DataLoadSimulation.Configuration_ApplyDataLoadSimulationProcedures; -EXEC WideWorldImporters.DataLoadSimulation.DailyProcessToCreateHistory +EXEC DataLoadSimulation.Configuration_ApplyDataLoadSimulationProcedures; +EXEC DataLoadSimulation.DailyProcessToCreateHistory @StartDate = '20130101', @EndDate = '20160331', @AverageNumberOfCustomerOrdersPerDay = 60, @@ -6171,11 +6167,11 @@ EXEC WideWorldImporters.DataLoadSimulation.DailyProcessToCreateHistory @UpdateCustomFields = 1, @IsSilentMode = 1, @AreDatesPrinted = 1; -EXEC WideWorldImporters.DataLoadSimulation.Configuration_RemoveDataLoadSimulationProcedures; +EXEC DataLoadSimulation.Configuration_RemoveDataLoadSimulationProcedures; -- roll data up to current date -EXEC WideWorldImporters.DataLoadSimulation.PopulateDataToCurrentDate +EXEC DataLoadSimulation.PopulateDataToCurrentDate @AverageNumberOfCustomerOrdersPerDay = 60, @SaturdayPercentageOfNormalWorkDay = 50, @SundayPercentageOfNormalWorkDay = 0, diff --git a/samples/databases/wide-world-importers/wwi-dw-database-scripts/4-wwi-dw-configure-required-database-objects.sql b/samples/databases/wide-world-importers/wwi-dw-database-scripts/4-wwi-dw-configure-required-database-objects.sql index e6a8c637..ac7b8d09 100644 --- a/samples/databases/wide-world-importers/wwi-dw-database-scripts/4-wwi-dw-configure-required-database-objects.sql +++ b/samples/databases/wide-world-importers/wwi-dw-database-scripts/4-wwi-dw-configure-required-database-objects.sql @@ -1124,7 +1124,6 @@ DROP PROCEDURE IF EXISTS [Application].Configuration_EnableInMemory; GO CREATE PROCEDURE [Application].Configuration_EnableInMemory -WITH EXECUTE AS OWNER AS BEGIN SET NOCOUNT ON;