Skip to content

Commit b0fd9fd

Browse files
author
mbt1
committed
rabbit holes..
1 parent dbf1549 commit b0fd9fd

4 files changed

Lines changed: 82 additions & 7 deletions

File tree

‎Build/Build.ssmssqlproj‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@
6060
<AssociatedConnUserName />
6161
<FullPath>GetFailedTestCount.sql</FullPath>
6262
</FileNode>
63+
<FileNode Name="GetFriendlySQLServerVersion.template.sql">
64+
<AssociatedConnectionMoniker />
65+
<AssociatedConnSrvName />
66+
<AssociatedConnUserName />
67+
<FullPath>GetFriendlySQLServerVersion.template.sql</FullPath>
68+
</FileNode>
6369
<FileNode Name="GetSQLServerVersion.sql">
6470
<AssociatedConnectionMoniker />
6571
<AssociatedConnSrvName />
@@ -118,6 +124,18 @@
118124
<AssociatedConnUserName />
119125
<FullPath>BuildHelper.exe</FullPath>
120126
</FileNode>
127+
<FileNode Name="BuildTestResultsZip.ps1">
128+
<AssociatedConnectionMoniker />
129+
<AssociatedConnSrvName />
130+
<AssociatedConnUserName />
131+
<FullPath>BuildTestResultsZip.ps1</FullPath>
132+
</FileNode>
133+
<FileNode Name="BuildtSQLtDacpac.ps1">
134+
<AssociatedConnectionMoniker />
135+
<AssociatedConnSrvName />
136+
<AssociatedConnUserName />
137+
<FullPath>BuildtSQLtDacpac.ps1</FullPath>
138+
</FileNode>
121139
<FileNode Name="BuildtSQLtZip.ps1">
122140
<AssociatedConnectionMoniker />
123141
<AssociatedConnSrvName />
@@ -142,6 +160,18 @@
142160
<AssociatedConnUserName />
143161
<FullPath>CreateAssemblyGenerator.exe</FullPath>
144162
</FileNode>
163+
<FileNode Name="CreateDebugSSMSProject.ps1">
164+
<AssociatedConnectionMoniker />
165+
<AssociatedConnSrvName />
166+
<AssociatedConnUserName />
167+
<FullPath>CreateDebugSSMSProject.ps1</FullPath>
168+
</FileNode>
169+
<FileNode Name="DacpacDeploy.ps1">
170+
<AssociatedConnectionMoniker />
171+
<AssociatedConnSrvName />
172+
<AssociatedConnUserName />
173+
<FullPath>DacpacDeploy.ps1</FullPath>
174+
</FileNode>
145175
<FileNode Name="FacadeBuildDacpac.ps1">
146176
<AssociatedConnectionMoniker />
147177
<AssociatedConnSrvName />
@@ -184,6 +214,12 @@
184214
<AssociatedConnUserName />
185215
<FullPath>LocalBuild.bat</FullPath>
186216
</FileNode>
217+
<FileNode Name="LocalValidateBuild.bat">
218+
<AssociatedConnectionMoniker />
219+
<AssociatedConnSrvName />
220+
<AssociatedConnUserName />
221+
<FullPath>LocalValidateBuild.bat</FullPath>
222+
</FileNode>
187223
<FileNode Name="NewRelease.doc">
188224
<AssociatedConnectionMoniker />
189225
<AssociatedConnSrvName />
@@ -202,6 +238,12 @@
202238
<AssociatedConnUserName />
203239
<FullPath>Setup.bat</FullPath>
204240
</FileNode>
241+
<FileNode Name="SetupDacpacBuild.ps1">
242+
<AssociatedConnectionMoniker />
243+
<AssociatedConnSrvName />
244+
<AssociatedConnUserName />
245+
<FullPath>SetupDacpacBuild.ps1</FullPath>
246+
</FileNode>
205247
<FileNode Name="SnInstallPfx.exe">
206248
<AssociatedConnectionMoniker />
207249
<AssociatedConnSrvName />

‎Build/BuildtSQLtDacpac.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login "$LoginTrimmed" -SqlCm
2929
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login "$LoginTrimmed" -SqlCmdPath $SqlCmdPath -FileNames ($dir+"/CreateBuildDb.sql") -Database "tempdb" -AdditionalParameters ('-v NewDbName="'+$DatabaseName+'"');
3030
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login "$LoginTrimmed" -SqlCmdPath $SqlCmdPath -FileNames "tSQLt.class.sql" -Database "$DatabaseName";
3131

32+
$FriendlySQLServerVersion = Get-FriendlySQLServerVersion -ServerName $ServerNameTrimmed -Login "$LoginTrimmed" -SqlCmdPath $SqlCmdPath;
3233
$tSQLtDacpacFileName = "tSQLt."+$FriendlySQLServerVersion+".dacpac";
3334
$tSQLtApplicationName = "tSQLt."+$FriendlySQLServerVersion;
3435
$tSQLtConnectionString = Get-SqlConnectionString -ServerName $ServerNameTrimmed -Login "$LoginTrimmed" -DatabaseName $DatabaseName;

‎TestUtil/tSQLt_testutil.class.sql‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,15 @@ BEGIN
411411
[Error] [int] NULL,
412412
[TestCaseSet] NVARCHAR(MAX) NULL,
413413
[RunGroup] NVARCHAR(MAX) NULL,
414-
[DatabaseName] NVARCHAR(MAX) NULL
414+
[DatabaseName] NVARCHAR(MAX) NULL,
415+
[Version] VARCHAR(14) NULL,
416+
[ClrVersion] NVARCHAR(4000) NULL,
417+
[ClrSigningKey] VARBINARY(8000) NULL,
418+
[InstalledOnSqlVersion] NUMERIC(10, 2) NULL,
419+
[SqlVersion] NUMERIC(10, 2) NULL,
420+
[SqlBuild] NUMERIC(10, 2) NULL,
421+
[SqlEdition] NVARCHAR(128) NULL,
422+
[HostPlatform] NVARCHAR(256) NULL
415423
);
416424
';
417425
EXEC(@cmd);
@@ -437,7 +445,7 @@ BEGIN
437445
AND C.is_identity = 0
438446
ORDER BY C.column_id
439447
FOR XML PATH,TYPE).value('.','NVARCHAR(MAX)');
440-
SET @cmd = 'INSERT INTO '+@TableName+'('+@cmd+'[RunGroup],[DatabaseName]) SELECT '+@cmd+'RG,DB FROM tSQLt_testutil.MultiRunLog RIGHT JOIN (VALUES('''+@RunGroup+''',DB_NAME()))XX(RG,DB) ON 1=1;'
448+
SET @cmd = 'INSERT INTO '+@TableName+' SELECT '+@cmd+'RG,DB,I.* FROM tSQLt_testutil.MultiRunLog CROSS JOIN tSQLt.Info() I RIGHT JOIN (VALUES('''+@RunGroup+''',DB_NAME()))XX(RG,DB) ON 1=1;'
441449

442450
EXEC(@cmd);
443451
END;
@@ -460,7 +468,15 @@ BEGIN
460468
'CAST(REPLICATE('' '','+CAST(MAX(ErrorML) AS NVARCHAR(MAX))+'-LEN(Error))+CAST(Error AS VARCHAR(MAX)) AS CHAR('+CAST(MAX(ErrorML)+1 AS NVARCHAR(MAX))+'))Error,'+
461469
'CAST(TestCaseSet AS CHAR('+CAST(MAX(TestCaseSetML) AS NVARCHAR(MAX))+'))TestCaseSet,'+
462470
'CAST(RunGroup AS CHAR('+CAST(MAX(RunGroupML) AS NVARCHAR(MAX))+'))RunGroup,'+
463-
'CAST(DatabaseName AS CHAR('+CAST(MAX(DatabaseNameML) AS NVARCHAR(MAX))+'))DatabaseName '+
471+
'CAST(DatabaseName AS CHAR('+CAST(MAX(DatabaseNameML) AS NVARCHAR(MAX))+'))DatabaseName, '+
472+
'CAST([Version] AS CHAR('+CAST(MAX(VersionML) AS NVARCHAR(MAX))+'))[Version], '+
473+
'CAST([ClrVersion] AS CHAR('+CAST(MAX(ClrVersionML) AS NVARCHAR(MAX))+'))[ClrVersion], '+
474+
'CONVERT(CHAR('+CAST(MAX(ClrSigningKeyML) AS NVARCHAR(MAX))+'),[ClrSigningKey],1)[ClrSigningKey], '+
475+
'CAST([InstalledOnSqlVersion] AS CHAR('+CAST(MAX(InstalledOnSqlVersionML) AS NVARCHAR(MAX))+'))[InstalledOnSqlVersion], '+
476+
'CAST([SqlVersion] AS CHAR('+CAST(MAX(SqlVersionML) AS NVARCHAR(MAX))+'))[SqlVersion], '+
477+
'CAST([SqlBuild] AS CHAR('+CAST(MAX(SqlBuildML) AS NVARCHAR(MAX))+'))[SqlBuild], '+
478+
'CAST([SqlEdition] AS CHAR('+CAST(MAX(SqlEditionML) AS NVARCHAR(MAX))+'))[SqlEdition], '+
479+
'CAST([HostPlatform] AS CHAR('+CAST(MAX(HostPlatformML) AS NVARCHAR(MAX))+'))[HostPlatform] '+
464480
'INTO tSQLt_testutil.LocalBuildLogTempFormatted FROM tSQLt_testutil.LocalBuildLogTemp'
465481
FROM
466482
(
@@ -472,9 +488,17 @@ BEGIN
472488
MAX(LEN(CAST(Error AS VARCHAR(MAX)))) ErrorML,
473489
2+MAX(LEN(TestCaseSet)) TestCaseSetML,
474490
2+MAX(LEN(RunGroup)) RunGroupML,
475-
2+MAX(LEN(DatabaseName)) DatabaseNameML
491+
2+MAX(LEN(DatabaseName)) DatabaseNameML,
492+
MAX(LEN(CAST([Version] AS VARCHAR(MAX)))) VersionML,
493+
MAX(LEN(CAST([ClrVersion] AS VARCHAR(MAX)))) ClrVersionML,
494+
MAX(LEN(CONVERT(NVARCHAR(MAX),[ClrSigningKey],1))) ClrSigningKeyML,
495+
MAX(LEN(CAST([InstalledOnSqlVersion] AS VARCHAR(MAX)))) InstalledOnSqlVersionML,
496+
MAX(LEN(CAST([SqlVersion] AS VARCHAR(MAX)))) SqlVersionML,
497+
MAX(LEN(CAST([SqlBuild] AS VARCHAR(MAX)))) SqlBuildML,
498+
MAX(LEN(CAST([SqlEdition] AS VARCHAR(MAX)))) SqlEditionML,
499+
MAX(LEN(CAST([HostPlatform] AS VARCHAR(MAX)))) HostPlatformML
476500
FROM tSQLt_testutil.LocalBuildLogTemp
477-
UNION ALL SELECT 2,7,7,7,5,11,8,12
501+
UNION ALL SELECT 2,7,7,7,5,11,8,12,1,1,1,1,1,1,1,1
478502
)X
479503
);
480504
EXEC(@cmd);

‎TestUtilTests/tSQLt_testutil_test_SA.class.sql‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,15 @@ BEGIN
2323
[Error] [int] NULL,
2424
[TestCaseSet] NVARCHAR(MAX) NULL,
2525
[RunGroup] NVARCHAR(MAX) NULL,
26-
[DatabaseName] NVARCHAR(MAX) NULL
26+
[DatabaseName] NVARCHAR(MAX) NULL,
27+
[Version] VARCHAR(14) NULL,
28+
[ClrVersion] NVARCHAR(4000) NULL,
29+
[ClrSigningKey] VARBINARY(8000) NULL,
30+
[InstalledOnSqlVersion] NUMERIC(10, 2) NULL,
31+
[SqlVersion] NUMERIC(10, 2) NULL,
32+
[SqlBuild] NUMERIC(10, 2) NULL,
33+
[SqlEdition] NVARCHAR(128) NULL,
34+
[HostPlatform] NVARCHAR(256) NULL
2735
);
2836

2937
EXEC('SELECT TOP(0) * INTO tSQLt_testutil_test_SA.[testtable for comparison Actual] FROM '+@TableName+';')
@@ -181,7 +189,7 @@ BEGIN
181189
FROM tSQLt_testutil_test_SA.[Temp BuildLog Table] X LEFT JOIN tSQLt_testutil_test_SA.[Temp BuildLog Table] AS MRL ON 0=1;
182190

183191
EXEC tSQLt.ExpectNoException;
184-
192+
185193
INSERT INTO #ignore
186194
EXEC tSQLt_testutil.CheckBuildLog @TableName = 'tSQLt_testutil_test_SA.[Temp BuildLog Table]';
187195

0 commit comments

Comments
 (0)