Renaming adhocanalytics to adhocreporting

microsoft · Nov 13, 2017 · d921e64 · d921e64
1 parent 9f2b40b
commit d921e64
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/...s/Adhoc Analytics/Demo-AdhocAnalytics.ps1 → ...s/Adhoc Reporting/Demo-AdhocReporting.ps1 b/...s/Adhoc Analytics/Demo-AdhocAnalytics.ps1 → ...s/Adhoc Reporting/Demo-AdhocReporting.ps1
@@ -1,4 +1,4 @@
-# Helper script for deploying and using adhoc analytics
+# Helper script for deploying and using adhoc reporting
 
 $DemoScenario = 2
 <# Select the demo scenario that will be run. It is recommended you run the scenarios below in order. 
@@ -40,7 +40,7 @@ if ($DemoScenario -eq 1)
 ### Deploy the Ad-hoc Analytics database used with Elastic Query to the catalog server
 if ($DemoScenario -eq 2)
 {
-    & $PSScriptRoot\Deploy-AdhocAnalyticsDB.ps1 `
+    & $PSScriptRoot\Deploy-AdhocReportingDB.ps1 `
         -WtpResourceGroupName $wtpUser.ResourceGroupName `
         -WtpUser $wtpUser.Name
     exit

diff --git a/... Analytics/Demo-AdhocAnalyticsQueries.sql → ... Reporting/Demo-AdhocReportingQueries.sql b/... Analytics/Demo-AdhocAnalyticsQueries.sql → ... Reporting/Demo-AdhocReportingQueries.sql
diff --git a/...hoc Analytics/Deploy-AdhocAnalyticsDB.ps1 → ...hoc Reporting/Deploy-AdhocReportingDB.ps1 b/...hoc Analytics/Deploy-AdhocAnalyticsDB.ps1 → ...hoc Reporting/Deploy-AdhocReportingDB.ps1
@@ -35,7 +35,7 @@ if(!$resourceGroup)
 
 $catalogServerName = $config.CatalogServerNameStem + $WtpUser
 $fullyQualifiedCatalogServerName = $catalogServerName + ".database.windows.net"
-$AdhocAnalyticsDatabaseName = $config.AdhocAnalyticsDatabaseName
+$AdhocAnalyticsDatabaseName = $config.AdhocReportingDatabaseName
 
 # Check if Ad-hoc Analytics database already exists 
 $adHocAnalyticsDB = Get-AzureRmSqlDatabase `
@@ -54,18 +54,18 @@ if($adHocAnalyticsDB)
 
 Write-output "Deploying database '$AdhocAnalyticsDatabaseName' on server '$catalogServerName'..."
 
-# Deploy adhoc analytics database 
+# Deploy adhoc reporting database 
 New-AzureRmSqlDatabase `
         -ResourceGroupName $WtpResourceGroupName `
         -ServerName $catalogServerName `
         -DatabaseName $AdhocAnalyticsDatabaseName `
-        -RequestedServiceObjectiveName $config.AdhocAnalyticsDatabaseServiceObjective `
+        -RequestedServiceObjectiveName $config.AdhocReportingDatabaseServiceObjective `
         > $null
 
 # if schema deployment is requested... 
 if($DeploySchema.IsPresent)
 {
-    $commandText = [IO.File]::ReadAllText("$PSScriptRoot\Initialize-AdhocAnalyticsDb.sql")
+    $commandText = [IO.File]::ReadAllText("$PSScriptRoot\Initialize-AdhocReportingDB.sql")
 
     Write-output "Initializing database schema..."
 

diff --git a/...Analytics/Initialize-AdhocAnalyticsDB.sql → ...Reporting/Initialize-AdhocReportingDB.sql b/...Analytics/Initialize-AdhocAnalyticsDB.sql → ...Reporting/Initialize-AdhocReportingDB.sql
@@ -1,5 +1,5 @@
 -- ********************************************************************************************
--- SETUP Adhoc analytics database with external data source and tables needed for Elastic Query 
+-- SETUP Adhoc reporting database with external data source and tables needed for Elastic Query 
 -- *********************************************************************************************
 
 -- Create encryption key that will encrypt database logins
@@ -189,7 +189,7 @@ WHEN NOT MATCHED BY TARGET THEN
 GO
 
 
---- Verify that the external data source and tables exist in the adhoc analytics database
+--- Verify that the external data source and tables exist in the adhoc reporting database
 select * from sys.external_data_sources;
 select * from sys.external_tables;
 GO

diff --git a/Learning Modules/WtpConfig.psm1 b/Learning Modules/WtpConfig.psm1
@@ -52,8 +52,8 @@ function Get-Configuration
         TenantAnalyticsDatabaseName = "tenantanalytics"
         TenantAnalyticsCSDatabaseName = "tenantanalytics-cs"
         TenantAnalyticsDWDatabaseName = "tenantanalytics-dw"
-        AdhocAnalyticsDatabaseName = "adhocanalytics"
-        AdhocAnalyticsDatabaseServiceObjective = "S0"
+        AdhocReportingDatabaseName = "adhocreporting"
+        AdhocReportingDatabaseServiceObjective = "S0"
         SearchDatabaseName = "tenantsearch"  
         SearchDatabaseServiceObjective = "S0"              
         StorageKeyType = "SharedAccessKey"