ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-16 09:35:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changing "files" to "sqlObjectScripts" to be more accurate (#22899)

Browse Source 
* Changing "files" to "sqlObjectScripts" to be more accurate

* fixing func call
This commit is contained in:
Benjin Dubishar
2023-05-01 08:31:13 -07:00
committed by GitHub
parent b86463ee71
commit 6b1dd0e468
8 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,7 @@ export class Project implements ISqlProject {
private _projectFilePath: string;
private _projectFileName: string;
private _projectGuid: string | undefined;
private _files: FileProjectEntry[] = [];
private _sqlObjectScripts: FileProjectEntry[] = [];
private _folders: FileProjectEntry[] = [];
private _dataSources: DataSource[] = [];
private _databaseReferences: IDatabaseReferenceProjectEntry[] = [];
@@ -83,8 +83,8 @@ export class Project implements ISqlProject {
return this._projectGuid;
}
public get files(): FileProjectEntry[] {
return this._files;
public get sqlObjectScripts(): FileProjectEntry[] {
return this._sqlObjectScripts;
}
public get folders(): FileProjectEntry[] {
@@ -233,7 +233,7 @@ export class Project implements ISqlProject {
await this.readNoneItems(); // also populates list of publish profiles, determined by file extension
await this.readFilesInProject(); // get SQL object scripts
await this.readSqlObjectScripts(); // get SQL object scripts
await this.readFolders(); // get folders
}
@@ -297,7 +297,7 @@ export class Project implements ISqlProject {
* Gets all the files specified by <Build Inlude="..."> and removes all the files specified by <Build Remove="...">
* and all files included by the default glob of the folder of the sqlproj if it's an sdk style project
*/
private async readFilesInProject(): Promise<void> {
private async readSqlObjectScripts(): Promise<void> {
const filesSet: Set<string> = new Set();
var result: GetScriptsResult = await this.sqlProjService.getSqlObjectScripts(this.projectFilePath);
@@ -311,17 +311,17 @@ export class Project implements ISqlProject {
}
// create a FileProjectEntry for each file
const fileEntries: FileProjectEntry[] = [];
const sqlObjectScriptEntries: FileProjectEntry[] = [];
for (let f of Array.from(filesSet.values())) {
// read file to check if it has a "Create Table" statement
const fullPath = path.join(utils.getPlatformSafeFileEntryPath(this.projectFolderPath), utils.getPlatformSafeFileEntryPath(f));
const containsCreateTableStatement: boolean = await utils.fileContainsCreateTableStatement(fullPath, this.getProjectTargetVersion());
fileEntries.push(this.createFileProjectEntry(f, EntryType.File, undefined, containsCreateTableStatement));
sqlObjectScriptEntries.push(this.createFileProjectEntry(f, EntryType.File, undefined, containsCreateTableStatement));
}
this._files = fileEntries;
this._sqlObjectScripts = sqlObjectScriptEntries;
}
private async readFolders(): Promise<void> {
@@ -479,7 +479,7 @@ export class Project implements ISqlProject {
//#endregion
private resetProject(): void {
this._files = [];
this._sqlObjectScripts = [];
this._databaseReferences = [];
this._sqlCmdVariables = new Map();
this._preDeployScripts = [];
@@ -541,7 +541,7 @@ export class Project implements ISqlProject {
const result = await this.sqlProjService.deleteFolder(this.projectFilePath, relativeFolderPath);
this.throwIfFailed(result);
await this.readFilesInProject();
await this.readSqlObjectScripts();
await this.readPreDeployScripts();
await this.readPostDeployScripts();
await this.readNoneItems();
@@ -552,7 +552,7 @@ export class Project implements ISqlProject {
const result = await this.sqlProjService.excludeFolder(this.projectFilePath, relativeFolderPath);
this.throwIfFailed(result);
await this.readFilesInProject();
await this.readSqlObjectScripts();
await this.readPreDeployScripts();
await this.readPostDeployScripts();
await this.readNoneItems();
@@ -563,7 +563,7 @@ export class Project implements ISqlProject {
const result = await this.sqlProjService.moveFolder(this.projectFilePath, relativeSourcePath, relativeDestinationPath);
this.throwIfFailed(result);
await this.readFilesInProject();
await this.readSqlObjectScripts();
await this.readPreDeployScripts();
await this.readPostDeployScripts();
await this.readNoneItems();
@@ -579,7 +579,7 @@ export class Project implements ISqlProject {
this.throwIfFailed(result);
if (reloadAfter) {
await this.readFilesInProject();
await this.readSqlObjectScripts();
await this.readFolders();
}
}
@@ -589,7 +589,7 @@ export class Project implements ISqlProject {
await this.addSqlObjectScript(path, false /* reloadAfter */);
}
await this.readFilesInProject();
await this.readSqlObjectScripts();
await this.readFolders();
}
@@ -597,7 +597,7 @@ export class Project implements ISqlProject {
const result = await this.sqlProjService.deleteSqlObjectScript(this.projectFilePath, relativePath);
this.throwIfFailed(result);
await this.readFilesInProject();
await this.readSqlObjectScripts();
await this.readFolders();
}
@@ -605,7 +605,7 @@ export class Project implements ISqlProject {
const result = await this.sqlProjService.excludeSqlObjectScript(this.projectFilePath, relativePath);
this.throwIfFailed(result);
await this.readFilesInProject();
await this.readSqlObjectScripts();
await this.readFolders();
}
@@ -718,7 +718,7 @@ export class Project implements ISqlProject {
// Check if file already has been added to sqlproj
const normalizedRelativeFilePath = utils.convertSlashesForSqlProj(relativeFilePath);
const existingEntry = this.files.find(f => f.relativePath.toUpperCase() === normalizedRelativeFilePath.toUpperCase());
const existingEntry = this.sqlObjectScripts.find(f => f.relativePath.toUpperCase() === normalizedRelativeFilePath.toUpperCase());
if (existingEntry) {
return existingEntry;
}
@@ -758,7 +758,7 @@ export class Project implements ISqlProject {
if (path.extname(filePath) === constants.sqlFileExtension) {
result = await this.sqlProjService.addSqlObjectScript(this.projectFilePath, normalizedRelativeFilePath)
await this.readFilesInProject();
await this.readSqlObjectScripts();
} else {
result = await this.sqlProjService.addNoneItem(this.projectFilePath, normalizedRelativeFilePath);
await this.readNoneItems();

2
extensions/sql-database-projects/src/models/tree/projectTreeItem.ts
View File

@@ -106,7 +106,7 @@ export class ProjectRootTreeItem extends BaseProjectTreeItem {
}
// sql object scripts
for (const entry of this.project.files) {
for (const entry of this.project.sqlObjectScripts) {
let newNode: fileTree.FileNode;
if (entry.sqlObjectType === ExternalStreamingJob) {