ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix publish profile with connection string ending in semicolon not loading (#14797)

Browse Source
This commit is contained in:
Kim Santiago
2021-03-19 13:17:51 -07:00
committed by GitHub
parent ce39b4bd19
commit d658af153d
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/sql-database-projects/src/models/dataSources/sqlConnectionStringSource.ts
View File

@@ -67,7 +67,8 @@ export class SqlConnectionDataSource extends DataSource {
// TODO: do we have a common construct for connection strings? // TODO: do we have a common construct for connection strings?
this.connectionString = connectionString; this.connectionString = connectionString;
for (const component of this.connectionString.split(';')) { const components = this.connectionString.split(';').filter(c => c !== '');
for (const component of components) {
const split = component.split('='); const split = component.split('=');
if (split.length !== 2) { if (split.length !== 2) {

3
extensions/sql-database-projects/src/test/baselines/publishProfileSqlLoginBaseline.publish.xml
View File

@@ -4,8 +4,7 @@
<IncludeCompositeObjects>True</IncludeCompositeObjects> <IncludeCompositeObjects>True</IncludeCompositeObjects>
<TargetDatabaseName>targetDb</TargetDatabaseName> <TargetDatabaseName>targetDb</TargetDatabaseName>
<DeployScriptFileName>DatabaseProject1.sql</DeployScriptFileName> <DeployScriptFileName>DatabaseProject1.sql</DeployScriptFileName>
<![CDATA[[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Test password, not actually used")]]> <TargetConnectionString>Data Source=testserver;User Id=testUser;Password=PLACEHOLDER;Integrated Security=false;Persist Security Info=False;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=60;Encrypt=False;TrustServerCertificate=True</TargetConnectionString>
<TargetConnectionString>Data Source=testserver;User Id=testUser;Password=abcd123;Integrated Security=false;Persist Security Info=False;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=60;Encrypt=False;TrustServerCertificate=True</TargetConnectionString>
<ProfileVersionNumber>1</ProfileVersionNumber> <ProfileVersionNumber>1</ProfileVersionNumber>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

10
extensions/sql-database-projects/src/test/datasource.test.ts
View File

@@ -9,12 +9,12 @@ import * as testUtils from './testUtils';
import * as sql from '../models/dataSources/sqlConnectionStringSource'; import * as sql from '../models/dataSources/sqlConnectionStringSource';
import * as dataSources from '../models/dataSources/dataSources'; import * as dataSources from '../models/dataSources/dataSources';
describe.skip('Data Sources: DataSource operations', function (): void { describe('Data Sources: DataSource operations', function (): void {
before(async function () : Promise<void> { before(async function () : Promise<void> {
await baselines.loadBaselines(); await baselines.loadBaselines();
}); });
it('Should read DataSources from datasource.json', async function (): Promise<void> { it.skip('Should read DataSources from datasource.json', async function (): Promise<void> {
const dataSourcePath = await testUtils.createTestDataSources(baselines.openDataSourcesBaseline); const dataSourcePath = await testUtils.createTestDataSources(baselines.openDataSourcesBaseline);
const dataSourceList = await dataSources.load(dataSourcePath); const dataSourceList = await dataSources.load(dataSourcePath);
@@ -31,4 +31,10 @@ describe.skip('Data Sources: DataSource operations', function (): void {
should((dataSourceList[2] as sql.SqlConnectionDataSource).integratedSecurity).equal(false); should((dataSourceList[2] as sql.SqlConnectionDataSource).integratedSecurity).equal(false);
should((dataSourceList[2] as sql.SqlConnectionDataSource).azureMFA).equal(true); should((dataSourceList[2] as sql.SqlConnectionDataSource).azureMFA).equal(true);
}); });
it ('Should be able to create sql data source from connection strings with and without ending semicolon', function (): void {
should.doesNotThrow(() => new sql.SqlConnectionDataSource('no ending semicolon', 'Data Source=(LOCAL);Initial Catalog=testdb;User id=sa;Password=PLACEHOLDER'));
should.doesNotThrow(() => new sql.SqlConnectionDataSource('ending in semicolon', 'Data Source=(LOCAL);Initial Catalog=testdb;User id=sa;Password=PLACEHOLDER;'));
should.throws(() => new sql.SqlConnectionDataSource('invalid extra equals sign', 'Data Source=(LOCAL);Initial Catalog=testdb=extra;User id=sa;Password=PLACEHOLDER'));
});
}); });