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

move checking if a file contains a create table statement to utils (#20512)

Browse Source
This commit is contained in:
Kim Santiago
2022-08-31 10:21:30 -07:00
committed by GitHub
parent 010fe91921
commit 83043dadcc
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
extensions/sql-database-projects/src/common/utils.ts
View File

@@ -689,3 +689,25 @@ export function throwIfNotConnected(connectionResult: azdataType.ConnectionResul
throw new Error(`${connectionResult.errorMessage} (${connectionResult.errorCode})`); throw new Error(`${connectionResult.errorMessage} (${connectionResult.errorCode})`);
} }
} }
/**
* Checks whether or not the provided file contains a create table statement
* @param fullPath full path to file to check
* @param projectTargetVersion target version of sql project containing this file
* @returns true if file includes a create table statement, false if it doesn't
*/
export async function fileContainsCreateTableStatement(fullPath: string, projectTargetVersion: string): Promise<boolean> {
let containsCreateTableStatement = false;
if (getAzdataApi() && await exists(fullPath)) {
const dacFxService = await getDacFxService() as mssql.IDacFxService;
try {
const result = await dacFxService.parseTSqlScript(fullPath, projectTargetVersion);
containsCreateTableStatement = result.containsCreateTableStatement;
} catch (e) {
console.error(getErrorMessage(e));
}
}
return containsCreateTableStatement;
}

13
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 xmlFormat from 'xml-formatter';
import * as os from 'os'; import * as os from 'os';
import * as UUID from 'vscode-languageclient/lib/utils/uuid'; import * as UUID from 'vscode-languageclient/lib/utils/uuid';
import * as mssql from 'mssql';
import { Uri, window } from 'vscode'; import { Uri, window } from 'vscode';
import { EntryType, IDatabaseReferenceProjectEntry, IProjectEntry, ISqlProject, ItemType, SqlTargetPlatform } from 'sqldbproj'; import { EntryType, IDatabaseReferenceProjectEntry, IProjectEntry, ISqlProject, ItemType, SqlTargetPlatform } from 'sqldbproj';
@@ -328,20 +327,10 @@ export class Project implements ISqlProject {
const fileEntries: FileProjectEntry[] = []; const fileEntries: FileProjectEntry[] = [];
for (let f of Array.from(filesSet.values())) { for (let f of Array.from(filesSet.values())) {
const typeEntry = entriesWithType.find(e => e.relativePath === f); const typeEntry = entriesWithType.find(e => e.relativePath === f);
let containsCreateTableStatement = false;
// read file to check if it has a "Create Table" statement // read file to check if it has a "Create Table" statement
const fullPath = path.join(utils.getPlatformSafeFileEntryPath(this.projectFolderPath), utils.getPlatformSafeFileEntryPath(f)); const fullPath = path.join(utils.getPlatformSafeFileEntryPath(this.projectFolderPath), utils.getPlatformSafeFileEntryPath(f));
const containsCreateTableStatement = await utils.fileContainsCreateTableStatement(fullPath, this.getProjectTargetVersion());
if (utils.getAzdataApi() && await utils.exists(fullPath)) {
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));
}
}
fileEntries.push(this.createFileProjectEntry(f, EntryType.File, typeEntry ? typeEntry.typeAttribute : undefined, containsCreateTableStatement)); fileEntries.push(this.createFileProjectEntry(f, EntryType.File, typeEntry ? typeEntry.typeAttribute : undefined, containsCreateTableStatement));
} }