Skip to content

Commit 6fda42f

Browse files
martinisaksenmartinisaksen
authored
Merge pull request #2 from tSQLt-org/master
Merging latest changes from tSQLt base
2 parents cfafbf2 + 9f2d261 commit 6fda42f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1372
-144
lines changed

‎.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,11 @@
1111
/tSQLtCLR/tSQLtExternalAccessKey/bin
1212
/tSQLtCLR/tSQLtExternalAccessKey/obj
1313
/tSQLtCLR/tSQLtCLR.v12.suo
14+
*.dtbcache
15+
*.suo
16+
/tSQLtCLR/builderr.txt
17+
/tSQLtCLR/buildlog.txt
18+
/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/db.lock
19+
/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/storage.ide
20+
/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/storage.ide-shm
21+
/tSQLtCLR/.vs/tSQLtCLR/v15/Server/sqlite3/storage.ide-wal

‎Build/Build.ssmssqlproj

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Items>
44
<LogicalFolder Name="Connections" Type="2" Sorted="true">
55
<Items>
6-
<ConnectionNode Name="Dev_2014:MacWin7A\meinse00">
6+
<ConnectionNode Name="Dev_2014:WIN10A\meinse00">
77
<Created>2014-12-31T18:06:01.9272147-05:00</Created>
88
<Type>SQL</Type>
99
<Server>Dev_2014</Server>
@@ -15,7 +15,7 @@
1515
<ConnectionProtocol>NotSpecified</ConnectionProtocol>
1616
<ApplicationName>Microsoft SQL Server Management Studio - Query</ApplicationName>
1717
</ConnectionNode>
18-
<ConnectionNode Name="Dev_tSQLt:MacWin7A\meinse00">
18+
<ConnectionNode Name="Dev_tSQLt:WIN10A\meinse00">
1919
<Created>2014-11-24T18:10:21.4587287-05:00</Created>
2020
<Type>SQL</Type>
2121
<Server>Dev_tSQLt</Server>
@@ -115,6 +115,12 @@
115115
<AssociatedConnUserName />
116116
<FullPath>Install(tSQLtExternalAccessKey).sql</FullPath>
117117
</FileNode>
118+
<FileNode Name="PrintVersionInfo.sql">
119+
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
120+
<AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
121+
<AssociatedConnUserName />
122+
<FullPath>PrintVersionInfo.sql</FullPath>
123+
</FileNode>
118124
</Items>
119125
</LogicalFolder>
120126
<LogicalFolder Name="Miscellaneous" Type="3" Sorted="true">
@@ -137,6 +143,12 @@
137143
<AssociatedConnUserName />
138144
<FullPath>CreateAssemblyGenerator.exe</FullPath>
139145
</FileNode>
146+
<FileNode Name="Install the tSQLt build.docx">
147+
<AssociatedConnectionMoniker />
148+
<AssociatedConnSrvName />
149+
<AssociatedConnUserName />
150+
<FullPath>Install the tSQLt build.docx</FullPath>
151+
</FileNode>
140152
<FileNode Name="License.txt">
141153
<AssociatedConnectionMoniker />
142154
<AssociatedConnSrvName />
@@ -191,12 +203,42 @@
191203
<AssociatedConnUserName />
192204
<FullPath>SqlLoginNbuild.bat</FullPath>
193205
</FileNode>
206+
<FileNode Name="tSQLt.build.xml">
207+
<AssociatedConnectionMoniker />
208+
<AssociatedConnSrvName />
209+
<AssociatedConnUserName />
210+
<FullPath>tSQLt.build.xml</FullPath>
211+
</FileNode>
212+
<FileNode Name="tSQLt.buildCLR.xml">
213+
<AssociatedConnectionMoniker />
214+
<AssociatedConnSrvName />
215+
<AssociatedConnUserName />
216+
<FullPath>tSQLt.buildCLR.xml</FullPath>
217+
</FileNode>
218+
<FileNode Name="tSQLt.copybuild.xml">
219+
<AssociatedConnectionMoniker />
220+
<AssociatedConnSrvName />
221+
<AssociatedConnUserName />
222+
<FullPath>tSQLt.copybuild.xml</FullPath>
223+
</FileNode>
224+
<FileNode Name="tSQLt.experiments.build.xml">
225+
<AssociatedConnectionMoniker />
226+
<AssociatedConnSrvName />
227+
<AssociatedConnUserName />
228+
<FullPath>tSQLt.experiments.build.xml</FullPath>
229+
</FileNode>
194230
<FileNode Name="tSQLt.local_build_output.build">
195231
<AssociatedConnectionMoniker />
196232
<AssociatedConnSrvName />
197233
<AssociatedConnUserName />
198234
<FullPath>tSQLt.local_build_output.build</FullPath>
199235
</FileNode>
236+
<FileNode Name="tSQLt.validatebuild.xml">
237+
<AssociatedConnectionMoniker />
238+
<AssociatedConnSrvName />
239+
<AssociatedConnUserName />
240+
<FullPath>tSQLt.validatebuild.xml</FullPath>
241+
</FileNode>
200242
<FileNode Name="VersionInfo.vbs">
201243
<AssociatedConnectionMoniker />
202244
<AssociatedConnSrvName />

‎Build/CreateAssemblyGenerator.exe

512 Bytes
Binary file not shown.

‎Build/Install the tSQLt build.docx

482 KB
Binary file not shown.

‎Build/LocalBuild.bat

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,38 @@
1-
cmd /C %1\bin\ant -Dmsbuild.path=%2 -Ddb.server=%3 -Ddb.name=%4 %5
1+
@ECHO OFF
2+
3+
REM CALL %1\bin\ant -buildfile Build\tSQLt.experiments.build.xml -Dmsbuild.path=%2 -verbose || goto :error
4+
REM goto :EOF
5+
6+
ECHO +-------------------------+
7+
ECHO : Starting CLR BUILD :
8+
ECHO +-------------------------+
9+
CALL %1\bin\ant -buildfile Build\tSQLt.buildCLR.xml -Dmsbuild.path=%2 || goto :error
10+
11+
ECHO +-------------------------+
12+
ECHO : Starting tSQLt BUILD :
13+
ECHO +-------------------------+
14+
CALL %1\bin\ant -buildfile Build\tSQLt.build.xml || goto :error
15+
16+
ECHO +-------------------------+
17+
ECHO : Copying BUILD :
18+
ECHO +-------------------------+
19+
ECHO :- THIS STEP IS OPTIONAL -:
20+
ECHO +-------------------------+
21+
CALL %1\bin\ant -buildfile Build\tSQLt.copybuild.xml || goto :error
22+
23+
ECHO +-------------------------+
24+
ECHO : Validating BUILD :
25+
ECHO +-------------------------+
26+
CALL %1\bin\ant -buildfile Build\tSQLt.validatebuild.xml -Ddb.version=%3 -Ddb.server=%4 -Ddb.name=%5 || goto :error
27+
28+
ECHO +-------------------------+
29+
ECHO : BUILD SUCCEEDED :
30+
ECHO +-------------------------+
31+
goto :EOF
32+
33+
:error
34+
ECHO +-------------------------+
35+
ECHO : !!! BUILD FAILED !!! :
36+
ECHO +-------------------------+
37+
exit /b %errorlevel%
38+

‎Build/PrintVersionInfo.sql

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
DECLARE @txt NVARCHAR(MAX);
2+
IF(OBJECT_ID('tempdb..#VersionInfoTable')IS NOT NULL)DROP TABLE #VersionInfoTable;
3+
SELECT Version, ClrVersion, ClrSigningKey INTO #VersionInfoTable FROM tSQLt.Info();
4+
EXEC tSQLt.TableToText @txt = @txt OUTPUT, @TableName = N'#VersionInfoTable';
5+
6+
RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
7+
RAISERROR('| tSQLt Info: |',0,1)WITH NOWAIT;
8+
RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
9+
RAISERROR('',0,1)WITH NOWAIT;
10+
RAISERROR(@txt,0,1)WITH NOWAIT;
11+
RAISERROR('',0,1)WITH NOWAIT;
12+
RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
13+
RAISERROR('| SQL Server Info: |',0,1)WITH NOWAIT;
14+
RAISERROR('+-----------------------------------------------------------------------------------------------------+',0,1)WITH NOWAIT;
15+
RAISERROR('',0,1)WITH NOWAIT;
16+
RAISERROR('%s',0,1,@@VERSION)WITH NOWAIT;
17+
RAISERROR('-------------------------------------------------------------------------------------------------------',0,1)WITH NOWAIT;

‎Build/Setup.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
IF "%~1"=="" GOTO :Usage
33

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

89
:Usage

‎Build/Version.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.0.7093.9172

0 commit comments

Comments
 (0)