Skip to content

Merging latest changes from tSQLt base #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Oct 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@
/tSQLtCLR/tSQLtExternalAccessKey/bin
/tSQLtCLR/tSQLtExternalAccessKey/obj
/tSQLtCLR/tSQLtCLR.v12.suo
*.dtbcache
*.suo
/tSQLtCLR/builderr.txt
/tSQLtCLR/buildlog.txt
/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/db.lock
/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/storage.ide
/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/storage.ide-shm
/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/storage.ide-wal
46 changes: 44 additions & 2 deletions Build/Build.ssmssqlproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Items>
<LogicalFolder Name="Connections" Type="2" Sorted="true">
<Items>
<ConnectionNode Name="Dev_2014:MacWin7A\meinse00">
<ConnectionNode Name="Dev_2014:WIN10A\meinse00">
<Created>2014-12-31T18:06:01.9272147-05:00</Created>
<Type>SQL</Type>
<Server>Dev_2014</Server>
Expand All @@ -15,7 +15,7 @@
<ConnectionProtocol>NotSpecified</ConnectionProtocol>
<ApplicationName>Microsoft SQL Server Management Studio - Query</ApplicationName>
</ConnectionNode>
<ConnectionNode Name="Dev_tSQLt:MacWin7A\meinse00">
<ConnectionNode Name="Dev_tSQLt:WIN10A\meinse00">
<Created>2014-11-24T18:10:21.4587287-05:00</Created>
<Type>SQL</Type>
<Server>Dev_tSQLt</Server>
Expand Down Expand Up @@ -115,6 +115,12 @@
<AssociatedConnUserName />
<FullPath>Install(tSQLtExternalAccessKey).sql</FullPath>
</FileNode>
<FileNode Name="PrintVersionInfo.sql">
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
<AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
<AssociatedConnUserName />
<FullPath>PrintVersionInfo.sql</FullPath>
</FileNode>
</Items>
</LogicalFolder>
<LogicalFolder Name="Miscellaneous" Type="3" Sorted="true">
Expand All @@ -137,6 +143,12 @@
<AssociatedConnUserName />
<FullPath>CreateAssemblyGenerator.exe</FullPath>
</FileNode>
<FileNode Name="Install the tSQLt build.docx">
<AssociatedConnectionMoniker />
<AssociatedConnSrvName />
<AssociatedConnUserName />
<FullPath>Install the tSQLt build.docx</FullPath>
</FileNode>
<FileNode Name="License.txt">
<AssociatedConnectionMoniker />
<AssociatedConnSrvName />
Expand Down Expand Up @@ -191,12 +203,42 @@
<AssociatedConnUserName />
<FullPath>SqlLoginNbuild.bat</FullPath>
</FileNode>
<FileNode Name="tSQLt.build.xml">
<AssociatedConnectionMoniker />
<AssociatedConnSrvName />
<AssociatedConnUserName />
<FullPath>tSQLt.build.xml</FullPath>
</FileNode>
<FileNode Name="tSQLt.buildCLR.xml">
<AssociatedConnectionMoniker />
<AssociatedConnSrvName />
<AssociatedConnUserName />
<FullPath>tSQLt.buildCLR.xml</FullPath>
</FileNode>
<FileNode Name="tSQLt.copybuild.xml">
<AssociatedConnectionMoniker />
<AssociatedConnSrvName />
<AssociatedConnUserName />
<FullPath>tSQLt.copybuild.xml</FullPath>
</FileNode>
<FileNode Name="tSQLt.experiments.build.xml">
<AssociatedConnectionMoniker />
<AssociatedConnSrvName />
<AssociatedConnUserName />
<FullPath>tSQLt.experiments.build.xml</FullPath>
</FileNode>
<FileNode Name="tSQLt.local_build_output.build">
<AssociatedConnectionMoniker />
<AssociatedConnSrvName />
<AssociatedConnUserName />
<FullPath>tSQLt.local_build_output.build</FullPath>
</FileNode>
<FileNode Name="tSQLt.validatebuild.xml">
<AssociatedConnectionMoniker />
<AssociatedConnSrvName />
<AssociatedConnUserName />
<FullPath>tSQLt.validatebuild.xml</FullPath>
</FileNode>
<FileNode Name="VersionInfo.vbs">
<AssociatedConnectionMoniker />
<AssociatedConnSrvName />
Expand Down
Binary file modified Build/CreateAssemblyGenerator.exe
Binary file not shown.
Binary file added Build/Install the tSQLt build.docx
Binary file not shown.
39 changes: 38 additions & 1 deletion Build/LocalBuild.bat
Original file line number Diff line number Diff line change
@@ -1 +1,38 @@
cmd /C %1\bin\ant -Dmsbuild.path=%2 -Ddb.server=%3 -Ddb.name=%4 %5
@ECHO OFF

REM CALL %1\bin\ant -buildfile Build\tSQLt.experiments.build.xml -Dmsbuild.path=%2 -verbose || goto :error
REM goto :EOF

ECHO +-------------------------+
ECHO : Starting CLR BUILD :
ECHO +-------------------------+
CALL %1\bin\ant -buildfile Build\tSQLt.buildCLR.xml -Dmsbuild.path=%2 || goto :error

ECHO +-------------------------+
ECHO : Starting tSQLt BUILD :
ECHO +-------------------------+
CALL %1\bin\ant -buildfile Build\tSQLt.build.xml || goto :error

ECHO +-------------------------+
ECHO : Copying BUILD :
ECHO +-------------------------+
ECHO :- THIS STEP IS OPTIONAL -:
ECHO +-------------------------+
CALL %1\bin\ant -buildfile Build\tSQLt.copybuild.xml || goto :error

ECHO +-------------------------+
ECHO : Validating BUILD :
ECHO +-------------------------+
CALL %1\bin\ant -buildfile Build\tSQLt.validatebuild.xml -Ddb.version=%3 -Ddb.server=%4 -Ddb.name=%5 || goto :error

ECHO +-------------------------+
ECHO : BUILD SUCCEEDED :
ECHO +-------------------------+
goto :EOF

:error
ECHO +-------------------------+
ECHO : !!! BUILD FAILED !!! :
ECHO +-------------------------+
exit /b %errorlevel%

17 changes: 17 additions & 0 deletions Build/PrintVersionInfo.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
DECLARE @txt NVARCHAR(MAX);
IF(OBJECT_ID('tempdb..#VersionInfoTable')IS NOT NULL)DROP TABLE #VersionInfoTable;
SELECT Version, ClrVersion, ClrSigningKey INTO #VersionInfoTable FROM tSQLt.Info();
EXEC tSQLt.TableToText @txt = @txt OUTPUT, @TableName = N'#VersionInfoTable';

RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
RAISERROR('| tSQLt Info: |',0,1)WITH NOWAIT;
RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
RAISERROR('',0,1)WITH NOWAIT;
RAISERROR(@txt,0,1)WITH NOWAIT;
RAISERROR('',0,1)WITH NOWAIT;
RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
RAISERROR('| SQL Server Info: |',0,1)WITH NOWAIT;
RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
RAISERROR('',0,1)WITH NOWAIT;
RAISERROR('%s',0,1,@@VERSION)WITH NOWAIT;
RAISERROR('-------------------------------------------------------------------------------------------------------',0,1)WITH NOWAIT;
3 changes: 2 additions & 1 deletion Build/Setup.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
IF "%~1"=="" GOTO :Usage

CD /d %~p0
sqlcmd -S %1 -E -I -d master -i "ExecuteAsSA.sql" "tSQLtKey.sql" "Create(tSQLtKey).sql" "CreateLogin(tSQLt.Build).sql" -V11
REM sqlcmd -S %1 -E -I -d master -i "ExecuteAsSA.sql" "tSQLtKey.sql" "Create(tSQLtKey).sql" "CreateLogin(tSQLt.Build).sql" -V11
sqlcmd -S %1 -E -I -d master -i "CreateLogin(tSQLt.Build).sql" -V11
GOTO :EOF

:Usage
Expand Down
1 change: 1 addition & 0 deletions Build/Version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0.7093.9172
Loading