Sizeoptimiser 2012 features (#92) (#93)

* Bring sp_sizeopt in line with other sprocs

* sp_sizeoptimiser - clean up print statements

* Automate installer script gen

* Fix @isexpress setting

* Reduce printing on sizeoptimiser

- Move PS module installs to install step

* Add token to appveyor for commits

* Move appveyor to dir

Author: lowlydba

appveyor.yml renamed to appveyor/appveyor.yml

@@ -8,21 +8,17 @@ max_jobs: 1
 clone_folder: C:\sqlexpress\
 
 environment:
-    #MSSQL Credentials
+    access_token:
+      secure: XQvkhXxMw7yJPQF4xQe/OV5+u0Dhx0bsaXIHE2PNvPJr15qw+oA9SNlKYnGo6UNQ
+
     MSSQL_LOGIN: sa
     MSSQL_PASS: Password12!
-    
-    #Test Files
-    CREATESCRIPT1: sp_sizeoptimiser.sql
-    CREATESCRIPT2: sp_helpme.sql
-    CREATESCRIPT3: sp_doc.sql
     TSQLTSETCLR:  tests\tSQLt\SetClrEnabled.sql
     TSQLTCREATEDB: tests\tSQLt\CreateDatabase.sql
     TSQLTINSTALL: tests\tSQLt\tSQLt.class.sql
     TSQLTBUILDPATH: tests\build
-    TSQLTTEST: tests\run\run_tests.sql
-    
-    #Build Constants
+    TSQLTTESTPATH: tests\run
+    COMBINED_FILE: install_expsql.sql
     TARGET_DB: tSQLt
 
     matrix:
@@ -46,19 +42,16 @@ environment:
       MSSQL: SQL2012SP1
       DB_INSTANCE: (local)\SQL2012SP1
 
-build_script:
+install:
+- ps: Install-Module SqlServer -Force -AllowClobber
+
 - echo Starting SQL Server
 - ps: >-
-
     $SQLInstance = $env:MSSQL;
     Start-Service "MSSQL`$$SQLInstance";
-
-- echo Installing SqlServer PS Module
-- ps: Install-Module SqlServer -Force -AllowClobber
    
 - echo Setting up tSQLt
 - cmd: >-
-
     SET SCRIPT=%CLONE_FOLDER%%TSQLTSETCLR%
     
     sqlcmd -S %DB_INSTANCE% -U %MSSQL_LOGIN% -P %MSSQL_PASS% -i %SCRIPT% -d master -b > NUL
@@ -71,27 +64,22 @@ build_script:
     
     sqlcmd -S %DB_INSTANCE% -U %MSSQL_LOGIN% -P %MSSQL_PASS% -i %SCRIPT% -d %TARGET_DB% -b
 
+build_script:
 - echo Installing ExpressSQL Scripts
 - ps: >-
-
     ForEach ($filename in Get-Childitem -Path $env:CLONE_FOLDER -Filter "*.sql") {
         Invoke-SqlCmd –ServerInstance $env:DB_INSTANCE -Database $env:TARGET_DB -InputFile $filename.fullname -Username $env:MSSQL_LOGIN -Password $env:MSSQL_PASS
     }
 
 - echo Building tSQLt Tests
 - ps: >-
-
     ForEach ($filename in Get-Childitem -Path $env:TSQLTBUILDPATH -Filter "*.sql") {
         Invoke-SqlCmd –ServerInstance $env:DB_INSTANCE -Database $env:TARGET_DB -InputFile $filename.fullname -Username $env:MSSQL_LOGIN -Password $env:MSSQL_PASS
     }
 
 test_script:
 - echo Running unit tests
-- cmd: >-
-
-    SET SCRIPT=%CLONE_FOLDER%%TSQLTTEST%
-
-    sqlcmd -S %DB_INSTANCE% -U %MSSQL_LOGIN% -P %MSSQL_PASS% -i %SCRIPT% -d %TARGET_DB% -b -r 1 > NUL
-
-
-deploy: off
+- ps: >-
+    ForEach ($filename in Get-Childitem -Path $env:TSQLTTESTPATH -Filter "*.sql") {
+        Invoke-SqlCmd –ServerInstance $env:DB_INSTANCE -Database $env:TARGET_DB -InputFile $filename.fullname -Username $env:MSSQL_LOGIN -Password $env:MSSQL_PASS -Verbose | Out-Null
+    }

appveyor/make_combined_script.ps1

@@ -0,0 +1,4 @@
+$File = "install_expsql.sql"
+
+Set-Location ../
+Get-Item *.sql | Get-Content | Out-File $File

install_expsql.sql

@@ -20,6 +20,8 @@ WITH RECOMPILE
 AS
 
 /*
+sp_doc - Part of the ExpressSQL Suite https://expresssql.lowlydba.com/
+
 MIT License
 
 Copyright (c) 2020 John McCall
@@ -42,7 +44,7 @@ DEALINGS IN THE SOFTWARE.
 
 Example:
 
-EXEC sp_doc @DatabaseName = 'WideWorldImporters';
+	EXEC sp_doc @DatabaseName = 'WideWorldImporters';
 
 */
 
@@ -55,7 +57,7 @@ BEGIN
 		,@ParmDefinition NVARCHAR(500)
 		,@QuotedDatabaseName SYSNAME
 		,@Msg NVARCHAR(MAX) 
-		,@LastUpdated NVARCHAR(20)	    = '2020-06-24';
+		,@LastUpdated NVARCHAR(20)	    = '2020-06-29';
 
 	-- Find Version
 	IF (@SqlMajorVersion = 0)

sp_doc.sql

@@ -19,6 +19,8 @@ ALTER PROCEDURE [dbo].[sp_helpme]
 AS
 
 /*
+sp_helpme - Part of the ExpressSQL Suite https://expresssql.lowlydba.com/
+
 MIT License
 
 Copyright (c) 2020 John McCall
@@ -41,7 +43,7 @@ DEALINGS IN THE SOFTWARE.
 
 Example:
 
-EXEC sp_helpme 'dbo.Sales';
+	EXEC sp_helpme 'dbo.Sales';
 
 */ 
 
@@ -65,7 +67,7 @@ BEGIN
 		,@SQLString NVARCHAR(MAX) 		= N''
 		,@Msg NVARCHAR(MAX) 			= N''
 		,@ParmDefinition NVARCHAR(500)
-		,@LastUpdated NVARCHAR(20)		= '2020-06-24';
+		,@LastUpdated NVARCHAR(20)		= '2020-06-29';
 
     /* Find Version */
 	IF (@SqlMajorVersion = 0)