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

Revert "use reliable way to detect createtable statements (#19897)" (#19906)

Browse Source 
This reverts commit 9a22c429a9.
This commit is contained in:
Alan Ren
2022-07-01 11:47:21 -07:00
committed by GitHub
parent 4ec2d78269
commit c211fb981c
8 changed files with 5 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/dacpac/src/test/testDacFxService.ts
View File

@@ -170,7 +170,4 @@ export class DacFxTestService implements mssql.IDacFxService {
};
return Promise.resolve(streamingJobValidationResult);
}
parseTSqlScript(filePath: string, databaseSchemaProvider: string): Thenable<mssql.ParseTSqlScriptResult> {
return Promise.resolve({ containsCreateTableStatement: true });
}
}

2
extensions/mssql/config.json
View File

@@ -1,6 +1,6 @@
{
"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
"version": "4.1.0.9",
"version": "4.1.0.4",
"downloadFileNames": {
"Windows_86": "win-x86-net6.0.zip",
"Windows_64": "win-x64-net6.0.zip",

9
extensions/mssql/src/contracts.ts
View File

@@ -545,11 +545,6 @@ export interface ValidateStreamingJobParams {
createStreamingJobTsql: string
}
export interface ParseTSqlScriptParams {
filePath: string;
databaseSchemaProvider: string;
}
export namespace ExportRequest {
export const type = new RequestType<ExportParams, mssql.DacFxResult, void, void>('dacfx/export');
}
@@ -582,10 +577,6 @@ export namespace ValidateStreamingJobRequest {
export const type = new RequestType<ValidateStreamingJobParams, mssql.ValidateStreamingJobResult, void, void>('dacfx/validateStreamingJob');
}
export namespace ParseTSqlScriptRequest {
export const type = new RequestType<ParseTSqlScriptParams, mssql.ParseTSqlScriptResult, void, void>('dacfx/parseTSqlScript');
}
// ------------------------------- </ DacFx > ------------------------------------
// ------------------------------- <CMS> ----------------------------------------

11
extensions/mssql/src/dacfx/dacFxService.ts
View File

@@ -130,15 +130,4 @@ export class DacFxService implements mssql.IDacFxService {
}
);
}
public async parseTSqlScript(filePath: string, databaseSchemaProvider: string): Promise<mssql.ParseTSqlScriptResult> {
const params: contracts.ParseTSqlScriptParams = { filePath, databaseSchemaProvider };
try {
const result = await this.client.sendRequest(contracts.ParseTSqlScriptRequest.type, params);
return result;
} catch (e) {
this.client.logFailedRequest(contracts.ParseTSqlScriptRequest.type, e);
throw e;
}
}
}

5
extensions/mssql/src/mssql.d.ts vendored
View File

@@ -391,7 +391,6 @@ declare module 'mssql' {
generateDeployPlan(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable<GenerateDeployPlanResult>;
getOptionsFromProfile(profilePath: string): Thenable<DacFxOptionsResult>;
validateStreamingJob(packageFilePath: string, createStreamingJobTsql: string): Thenable<ValidateStreamingJobResult>;
parseTSqlScript(filePath: string, databaseSchemaProvider: string): Thenable<ParseTSqlScriptResult>;
}
export interface DacFxResult extends azdata.ResultStatus {
@@ -409,10 +408,6 @@ declare module 'mssql' {
export interface ValidateStreamingJobResult extends azdata.ResultStatus {
}
export interface ParseTSqlScriptResult {
containsCreateTableStatement: boolean;
}
export interface ExportParams {
databaseName: string;
packageFilePath: string;

14
extensions/sql-database-projects/src/models/project.ts
View File

@@ -10,7 +10,6 @@ import * as utils from '../common/utils';
import * as xmlFormat from 'xml-formatter';
import * as os from 'os';
import * as UUID from 'vscode-languageclient/lib/utils/uuid';
import * as mssql from 'mssql';
import { Uri, window } from 'vscode';
import { EntryType, IDatabaseReferenceProjectEntry, IProjectEntry, ISqlProject, ItemType, SqlTargetPlatform } from 'sqldbproj';
@@ -248,19 +247,14 @@ export class Project implements ISqlProject {
const fileEntries: FileProjectEntry[] = [];
for (let f of Array.from(filesSet.values())) {
const typeEntry = entriesWithType.find(e => e.relativePath === f);
let containsCreateTableStatement = false;
let containsCreateTableStatement;
// read file to check if it has a "Create Table" statement
const fullPath = path.join(utils.getPlatformSafeFileEntryPath(this.projectFolderPath), utils.getPlatformSafeFileEntryPath(f));
if (utils.getAzdataApi()) {
const dacFxService = await utils.getDacFxService() as mssql.IDacFxService;
try {
const result = await dacFxService.parseTSqlScript(fullPath, this.getProjectTargetVersion());
containsCreateTableStatement = result.containsCreateTableStatement;
} catch (e) {
console.error(utils.getErrorMessage(e));
}
if (await utils.exists(fullPath)) {
const fileContents = await fs.readFile(fullPath);
containsCreateTableStatement = fileContents.toString().toLowerCase().includes('create table');
}
fileEntries.push(this.createFileProjectEntry(f, EntryType.File, typeEntry ? typeEntry.typeAttribute : undefined, containsCreateTableStatement));

1
extensions/sql-database-projects/src/test/testContext.ts
View File

@@ -140,7 +140,6 @@ export class MockDacFxService implements mssql.IDacFxService {
public generateDeployPlan(_: string, __: string, ___: string, ____: azdata.TaskExecutionMode): Thenable<mssql.GenerateDeployPlanResult> { return Promise.resolve(mockDacFxResult); }
public getOptionsFromProfile(_: string): Thenable<mssql.DacFxOptionsResult> { return Promise.resolve(mockDacFxOptionsResult); }
public validateStreamingJob(_: string, __: string): Thenable<mssql.ValidateStreamingJobResult> { return Promise.resolve(mockDacFxResult); }
public parseTSqlScript(_: string, __: string): Thenable<mssql.ParseTSqlScriptResult> { return Promise.resolve({ containsCreateTableStatement: true }); }
}
export function createContext(): TestContext {

5
extensions/sql-database-projects/src/test/testUtils.ts
View File

@@ -6,7 +6,6 @@
import * as path from 'path';
import * as os from 'os';
import * as constants from '../common/constants';
import * as templates from '../templates/templates';
import { promises as fs } from 'fs';
import should = require('should');
@@ -35,10 +34,6 @@ export async function createTestSqlProjFile(contents: string, folderPath?: strin
}
export async function createTestProject(contents: string, folderPath?: string): Promise<Project> {
const macroDict: Record<string, string> = {
'PROJECT_DSP': constants.defaultDSP
};
contents = templates.macroExpansion(contents, macroDict);
return await Project.openProject(await createTestSqlProjFile(contents, folderPath));
}