Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix linebreaks in generated SQL #326

Merged
merged 3 commits into from
Feb 3, 2025
Merged

Fix linebreaks in generated SQL #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b27ca01
Fix linebreaks in generated SQL
chrjorgensen Jan 31, 2025
527ec2f
Use different API to download generated SQL
worksofliam Jan 31, 2025
f07c5ad
Show progress notification for generating SQL
worksofliam Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -970,7 +970,7 @@
},
{
"command": "vscode-db2i.getObjectLocks",
"when": "viewItem == table || viewItem == view || viewItem == alias || viewItem == constraint || viewItem == function || viewItem == variable || viewItem == index || viewItem == procedure || viewItem == sequence || viewItem == package || viewItem == trigger || viewItem == type",
"when": "viewItem == table || viewItem == view || viewItem == alias || viewItem == function || viewItem == variable || viewItem == index || viewItem == procedure || viewItem == sequence || viewItem == package || viewItem == trigger || viewItem == type",
"group": "db2workWith@5"
},
{
Expand Down Expand Up @@ -1322,7 +1322,7 @@
},
"devDependencies": {
"@continuedev/core": "^1.0.13",
"@halcyontech/vscode-ibmi-types": "^2.14.0",
"@halcyontech/vscode-ibmi-types": "^2.14.5",
"@types/glob": "^7.1.3",
"@types/node": "18.x",
"@types/vscode": "^1.95.0",
Expand Down
30 changes: 22 additions & 8 deletions src/database/schemas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import path from "path";
import { getInstance } from "../base";

import { JobManager } from "../config";

export type SQLType = "schemas" | "tables" | "views" | "aliases" | "constraints" | "functions" | "variables" | "indexes" | "procedures" | "sequences" | "packages" | "triggers" | "types" | "logicals";
Expand Down Expand Up @@ -220,13 +220,27 @@ export default class Schemas {
* @param object Not user input
*/
static async generateSQL(schema: string, object: string, internalType: string): Promise<string> {
const lines = await JobManager.runSQL<{ SRCDTA: string }>([
`CALL QSYS2.GENERATE_SQL(?, ?, ?, CREATE_OR_REPLACE_OPTION => '1', PRIVILEGES_OPTION => '0')`
].join(` `), { parameters: [object, schema, internalType] });

const generatedStatement = lines.map(line => line.SRCDTA).join(`\n`);

return generatedStatement;
const instance = getInstance();
const connection = instance.getConnection();

const result = await connection.withTempDirectory<string>(async (tempDir) => {
const tempFilePath = path.posix.join(tempDir, `generatedSql.sql`);
await JobManager.runSQL<{ SRCDTA: string }>([
`CALL QSYS2.GENERATE_SQL( DATABASE_OBJECT_NAME => ?, DATABASE_OBJECT_LIBRARY_NAME => ?, DATABASE_OBJECT_TYPE => ?
, CREATE_OR_REPLACE_OPTION => '1', PRIVILEGES_OPTION => '0'
, DATABASE_SOURCE_FILE_NAME => '*STMF'
, STATEMENT_FORMATTING_OPTION => '0'
, SOURCE_STREAM_FILE => '${tempFilePath}'
, SOURCE_STREAM_FILE_END_OF_LINE => 'LF'
, SOURCE_STREAM_FILE_CCSID => 1208 )`
].join(` `), { parameters: [object, schema, internalType] });

// TODO: eventually .content -> .getContent(), it's not available yet
const contents = (await connection.content.downloadStreamfileRaw(tempFilePath)).toString();
return contents;
})

return result;
}

static async deleteObject(schema: string, name: string, type: string): Promise<void> {
Expand Down
80 changes: 41 additions & 39 deletions src/views/schemaBrowser/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ const itemIcons = {
export default class schemaBrowser {
emitter: vscode.EventEmitter<any | undefined | null | void>;
onDidChangeTreeData: vscode.Event<any | undefined | null | void>;
cache: {[key: string]: object[]};
cache: { [key: string]: object[] };

filters: {[schema: string]: string} = {};
filters: { [schema: string]: string } = {};

/**
* @param {vscode.ExtensionContext} context
Expand Down Expand Up @@ -138,13 +138,15 @@ export default class schemaBrowser {

vscode.commands.registerCommand(`vscode-db2i.generateSQL`, async (object: SQLObject) => {
if (object) {
try {
const content = await Schemas.generateSQL(object.schema, object.uniqueName(), object.type.toUpperCase());
const textDoc = await vscode.workspace.openTextDocument({language: `sql`, content});
await vscode.window.showTextDocument(textDoc);
} catch (e) {
vscode.window.showErrorMessage(e.message);
}
vscode.window.withProgress({ location: vscode.ProgressLocation.Window, title: `Generating SQL` }, async () => {
try {
const content = await Schemas.generateSQL(object.schema, object.uniqueName(), object.type.toUpperCase());
const textDoc = await vscode.workspace.openTextDocument({ language: `sql`, content });
await vscode.window.showTextDocument(textDoc);
} catch (e) {
vscode.window.showErrorMessage(e.message);
}
});
}
}),

Expand All @@ -162,10 +164,10 @@ export default class schemaBrowser {
}
}),

vscode.commands.registerCommand(`vscode-db2i.getMTIs`, async (object: SQLObject|SchemaItem) => {
vscode.commands.registerCommand(`vscode-db2i.getMTIs`, async (object: SQLObject | SchemaItem) => {
if (object) {
const content = getMTIStatement(object.schema, (`name` in object ? object.name : undefined));

if (content) {
vscode.commands.executeCommand(`vscode-db2i.runEditorStatement`, {
content,
Expand All @@ -186,7 +188,7 @@ export default class schemaBrowser {
});
}
}),

vscode.commands.registerCommand(`vscode-db2i.getAuthorities`, async (object: SQLObject) => {
if (object) {
const content = getAuthoritiesStatement(object.schema, object.name, object.type.toUpperCase(), object.tableType);
Expand All @@ -209,16 +211,16 @@ export default class schemaBrowser {
}
}),

vscode.commands.registerCommand(`vscode-db2i.advisedIndexes`, async (object: SQLObject|SchemaItem) => { //table
vscode.commands.registerCommand(`vscode-db2i.advisedIndexes`, async (object: SQLObject | SchemaItem) => { //table
if (object) {
let content: string|undefined;
let content: string | undefined;
if (`name` in object) {
content = getAdvisedIndexesStatement(object.schema, object.name);
}
else {
content = getAdvisedIndexesStatement(object.schema);
}

if (content) {
vscode.commands.executeCommand(`vscode-db2i.runEditorStatement`, {
content,
Expand All @@ -229,16 +231,16 @@ export default class schemaBrowser {
}
}),

vscode.commands.registerCommand(`vscode-db2i.clearAdvisedIndexes`, async (object: SQLObject|SchemaItem) => {
vscode.commands.registerCommand(`vscode-db2i.clearAdvisedIndexes`, async (object: SQLObject | SchemaItem) => {
if (object) {
const isObject = `name` in object;
let result;

result = await vscode.window.showWarningMessage(`Are you sure you want to clear all of the advised index rows from the Index Advisor for ${object.schema}${isObject ? `${object.name}` : ''}?`, {
result = await vscode.window.showWarningMessage(`Are you sure you want to clear all of the advised index rows from the Index Advisor for ${object.schema}${isObject ? `${object.name}` : ''}?`, {
modal: true,
}, 'No', 'Yes');
if(result === 'Yes') {

if (result === 'Yes') {
try {
await Schemas.clearAdvisedIndexes(object.schema, isObject ? object.name : undefined);
} catch (e) {
Expand All @@ -254,7 +256,7 @@ export default class schemaBrowser {
modal: true,
}, 'No', 'Yes');

if(result === 'Yes') {
if (result === 'Yes') {
try {
await vscode.window.withProgress({
location: vscode.ProgressLocation.Notification,
Expand Down Expand Up @@ -289,7 +291,7 @@ export default class schemaBrowser {
}, async () => {
await Schemas.renameObject(object.schema, object.name, name, object.type);
});

vscode.window.showInformationMessage(`Renamed ${object.name} to ${name}`);
this.clearCacheAndRefresh();
} catch (e) {
Expand All @@ -301,14 +303,14 @@ export default class schemaBrowser {
}
}
}),

vscode.commands.registerCommand(`vscode-db2i.clearData`, async (object: SQLObject) => {
if (object) {
const result = await vscode.window.showWarningMessage(`Are you sure you want to clear ${object.name}?`, {
modal: true,
}, 'No', 'Yes');

if(result === 'Yes') {
if (result === 'Yes') {
try {
await vscode.window.withProgress({
location: vscode.ProgressLocation.Notification,
Expand All @@ -328,8 +330,8 @@ export default class schemaBrowser {
vscode.commands.registerCommand(`vscode-db2i.copyData`, async (object: SQLObject) => {
if (object) {
const page = await getCopyUi().loadPage<any>((`Copy File - ${object.schema}.${object.name}`));
if(page && page.data) {

if (page && page.data) {
const data = page.data;
page.panel.dispose();

Expand All @@ -341,7 +343,7 @@ export default class schemaBrowser {
}, async () => {
await Table.copyFile(object.system.schema, object.system.name, data);
});

vscode.window.showInformationMessage(`Table copied`);
this.clearCacheAndRefresh();
} catch (e) {
Expand Down Expand Up @@ -369,7 +371,7 @@ export default class schemaBrowser {

const config = getInstance().getConfig();
const currentLibrary = config.currentLibrary.toUpperCase();

if (schema && schema !== currentLibrary) {
config.currentLibrary = schema;
await getInstance().setConfig(config);
Expand Down Expand Up @@ -477,7 +479,7 @@ export default class schemaBrowser {
return element;
}

async getChildren(element?: Schema|SchemaItem|SQLObject) {
async getChildren(element?: Schema | SchemaItem | SQLObject) {
let items = [];

if (element) {
Expand All @@ -489,7 +491,7 @@ export default class schemaBrowser {
let filterValue = this.filters[element.schema];
if (filterValue) {
const validSchemaName = Statement.noQuotes(element.schema);
const filteredObjects = await Schemas.getObjects(validSchemaName, AllSQLTypes, {filter: filterValue});
const filteredObjects = await Schemas.getObjects(validSchemaName, AllSQLTypes, { filter: filterValue });
items = filteredObjects.map(obj => new SQLObject(obj));

} else {
Expand All @@ -499,16 +501,16 @@ export default class schemaBrowser {


} else
if (element instanceof SchemaItem) {
items = await this.fetchData(element.schema, contextValue as SQLType, false);
} else
if (element instanceof SQLObject) {
const type = element.type;

if (Types[type]) {
items = await Types[type].getChildren(element.schema, element.uniqueName());
}
}
if (element instanceof SchemaItem) {
items = await this.fetchData(element.schema, contextValue as SQLType, false);
} else
if (element instanceof SQLObject) {
const type = element.type;

if (Types[type]) {
items = await Types[type].getChildren(element.schema, element.uniqueName());
}
}

} else {
const connection = getInstance().getConnection();
Expand Down
Loading