Skip to content

Add more database object types to the Schema Browser #449

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

Open
SanjulaGanepola wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Add more database object types to the Schema Browser #449

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6626b78
Add missing object types to schema browser
SanjulaGanepola Sep 24, 2025
6f9af26
Re-order to alphabetical order
SanjulaGanepola Sep 24, 2025
32f26fe
Add configuration to edit database object types
SanjulaGanepola Sep 24, 2025
c7809cb
Add filter button
SanjulaGanepola Sep 24, 2025
91adb28
Fix undefined editor
SanjulaGanepola Sep 29, 2025
9bdc80f
Fix SYS_NAME and SYS_SCHEMA
SanjulaGanepola Sep 29, 2025
6dfdcce
Remove view permissions command
SanjulaGanepola Sep 29, 2025
ba298ef
Reorder yes and no options
SanjulaGanepola Sep 29, 2025
6a2d009
Fix right-click actions for new database object types
SanjulaGanepola Sep 29, 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
125 changes: 120 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,106 @@
}
}
},
{
"id": "vscode-db2i.schemaBrowser",
"title": "Schema Browser",
"properties": {
"vscode-db2i.schemaBrowser.databaseObjectTypes": {
"type": "object",
"default": {
"Aliases": true,
"Column Masks": true,
"Constraints": true,
"Functions": true,
"Global Variables": true,
"Indexes": true,
"Journal Receivers": true,
"Journals": true,
"Logicals": true,
"Procedures": true,
"Row Permissions": true,
"Sequences": true,
"SQL Packages": true,
"Tables": true,
"Triggers": true,
"Types": true,
"Views": true
},
"properties": {
"Aliases": {
"type": "boolean",
"default": true
},
"Column Masks": {
"type": "boolean",
"default": true
},
"Constraints": {
"type": "boolean",
"default": true
},
"Functions": {
"type": "boolean",
"default": true
},
"Global Variables": {
"type": "boolean",
"default": true
},
"Indexes": {
"type": "boolean",
"default": true
},
"Journal Receivers": {
"type": "boolean",
"default": true
},
"Journals": {
"type": "boolean",
"default": true
},
"Logicals": {
"type": "boolean",
"default": true
},
"Procedures": {
"type": "boolean",
"default": true
},
"Row Permissions": {
"type": "boolean",
"default": true
},
"Sequences": {
"type": "boolean",
"default": true
},
"SQL Packages": {
"type": "boolean",
"default": true
},
"Tables": {
"type": "boolean",
"default": true
},
"Triggers": {
"type": "boolean",
"default": true
},
"Types": {
"type": "boolean",
"default": true
},
"Views": {
"type": "boolean",
"default": true
}
},
"additionalProperties": false,
"description": "Select which database object types should be shown in the Schema Browser"
}
}
},
{
"id": "vscode-db2i.resultsets",
"title": "Viewing Data",
Expand Down Expand Up @@ -439,6 +539,12 @@
"category": "Db2 for i",
"icon": "$(list-selection)"
},
{
"command": "vscode-db2i.filterDatabaseObjectTypes",
"title": "Filter Database Object Types",
"category": "Db2 for i",
"icon": "$(filter)"
},
{
"command": "vscode-db2i.removeSchemaFromSchemaBrowser",
"title": "Remove schema from view",
Expand Down Expand Up @@ -876,6 +982,10 @@
"command": "vscode-db2i.importDataContextMenu",
"when": "false"
},
{
"command": "vscode-db2i.filterDatabaseObjectTypes",
"when": "never"
},
{
"command": "vscode-db2i.setSchemaFilter",
"when": "never"
Expand Down Expand Up @@ -1040,14 +1150,19 @@
],
"view/title": [
{
"command": "vscode-db2i.refreshSchemaBrowser",
"group": "navigation",
"command": "vscode-db2i.manageSchemaBrowserList",
"group": "navigation@0",
"when": "view == schemaBrowser && vscode-db2i:manageSchemaBrowserEnabled"
},
{
"command": "vscode-db2i.filterDatabaseObjectTypes",
"group": "navigation@1",
"when": "view == schemaBrowser"
},
{
"command": "vscode-db2i.manageSchemaBrowserList",
"group": "navigation",
"when": "view == schemaBrowser && vscode-db2i:manageSchemaBrowserEnabled"
"command": "vscode-db2i.refreshSchemaBrowser",
"group": "navigation@2",
"when": "view == schemaBrowser"
},
{
"command": "vscode-db2i.resultset.settings",
Expand Down
80 changes: 70 additions & 10 deletions src/database/schemas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { getInstance } from "../base";
import { JobManager } from "../config";
import { ResolvedSqlObject, BasicSQLObject } from "../types";

export type SQLType = "schemas" | "tables" | "views" | "aliases" | "constraints" | "functions" | "variables" | "indexes" | "procedures" | "sequences" | "packages" | "triggers" | "types" | "logicals";
export type SQLType = "schemas" | "tables" | "views" | "aliases" | "masks" | "constraints" | "functions" | "variables" | "indexes" | "procedures" | "receivers" | "journals" | "permissions" | "sequences" | "packages" | "triggers" | "types" | "logicals";
export type PageData = { filter?: string, offset?: number, limit?: number, sort?: boolean };

const typeMap = {
Expand All @@ -14,17 +14,21 @@ const typeMap = {
'logicals': [`L`],
};

export const AllSQLTypes: SQLType[] = ["tables", "views", "aliases", "constraints", "functions", "variables", "indexes", "procedures", "sequences", "packages", "triggers", "types", "logicals"];
export const AllSQLTypes: SQLType[] = ["tables", "views", "aliases", "masks", "constraints", "functions", "variables", "indexes", "procedures", "receivers", "journals", "permissions", "sequences", "packages", "triggers", "types", "logicals"];

export const InternalTypes: { [t: string]: string } = {
"tables": `table`,
"views": `view`,
"aliases": `alias`,
"masks": `mask`,
"constraints": `constraint`,
"functions": `function`,
"variables": `variable`,
"indexes": `index`,
"procedures": `procedure`,
"receivers": `receiver`,
"journals": `journal`,
"permissions": `permission`,
"sequences": `sequence`,
"packages": `package`,
"triggers": `trigger`,
Expand Down Expand Up @@ -284,6 +288,19 @@ export default class Schemas {
parameters.push(schema, ...filter.parameters);
break;

case "masks":
filter = getFilterClause(`NAME`, details.filter);
selects.push(
[
`select '${type}' as OBJ_TYPE, '' as TABLE_TYPE, NAME as NAME, COALESCE(LABEL, '') as TEXT, SYSTEM_TABLE_NAME as SYS_NAME, SYSTEM_TABLE_SCHEMA as SYS_SCHEMA, '' as SPECNAME, TABLE_SCHEMA as BASE_SCHEMA, TABLE_NAME as BASE_OBJ`,
`from QSYS2.SYSCONTROLS`,
`where SCHEMA = ? AND CONTROL_TYPE = 'M' ${filter.clause}`,
].join(` `)
);

parameters.push(schema, ...filter.parameters);
break;

case `constraints`:
filter = getFilterClause(`CONSTRAINT_NAME`, details.filter);
selects.push(
Expand Down Expand Up @@ -349,6 +366,45 @@ export default class Schemas {
parameters.push(schema, ...filter.parameters);
break;

case "receivers":
filter = getFilterClause(`JOURNAL_RECEIVER_NAME`, details.filter);
selects.push(
[
`select '${type}' as OBJ_TYPE, '' as TABLE_TYPE, JOURNAL_RECEIVER_NAME as NAME, DESCRIPTIVE_TEXT as TEXT, '' as SYS_NAME, '' as SYS_SCHEMA, '' as SPECNAME, JOURNAL_LIBRARY as BASE_SCHEMA, JOURNAL_NAME as BASE_OBJ`,
`from QSYS2.JOURNAL_RECEIVER_INFO`,
`where JOURNAL_RECEIVER_LIBRARY = ? ${filter.clause}`,
].join(` `)
);

parameters.push(schema, ...filter.parameters);
break;

case "journals":
filter = getFilterClause(`JOURNAL_NAME`, details.filter);
selects.push(
[
`select '${type}' as OBJ_TYPE, '' as TABLE_TYPE, JOURNAL_NAME as NAME, JOURNAL_TEXT as TEXT, '' as SYS_NAME, '' as SYS_SCHEMA, '' as SPECNAME, JOURNAL_LIBRARY as BASE_SCHEMA, ATTACHED_JOURNAL_RECEIVER_NAME as BASE_OBJ`,
`from QSYS2.JOURNAL_INFO`,
`where JOURNAL_LIBRARY = ? ${filter.clause}`,
].join(` `)
);

parameters.push(schema, ...filter.parameters);
break;

case "permissions":
filter = getFilterClause(`NAME`, details.filter);
selects.push(
[
`select '${type}' as OBJ_TYPE, '' as TABLE_TYPE, NAME as NAME, COALESCE(LABEL, '') as TEXT, SYSTEM_TABLE_NAME as SYS_NAME, SYSTEM_TABLE_SCHEMA as SYS_SCHEMA, '' as SPECNAME, TABLE_SCHEMA as BASE_SCHEMA, TABLE_NAME as BASE_OBJ`,
`from QSYS2.SYSCONTROLS`,
`where SCHEMA = ? and CONTROL_TYPE = 'R' ${filter.clause}`,
].join(` `)
);

parameters.push(schema, ...filter.parameters);
break;

case `sequences`:
filter = getFilterClause(`SEQUENCE_NAME`, details.filter);
selects.push(
Expand All @@ -362,14 +418,18 @@ export default class Schemas {
parameters.push(schema, ...filter.parameters);
break;

// case `packages`:
// selects.push([
// `select '${type}' as OBJ_TYPE, '' as TABLE_TYPE, PACKAGE_NAME as NAME, PACKAGE_TEXT as TEXT, PROGRAM_SCHEMA as BASE_SCHEMA, PROGRAM_NAME as BASE_OBJ, `,
// ` '' as SYS_SCHEMA, '' as SYS_NAME, '' as SPECNAME`,
// `from QSYS2.SQLPACKAGE`,
// `where PACKAGE_SCHEMA = '${schema}' ${details.filter ? `and PACKAGE_NAME like '%${filter.clause}%'`: ``}`,
// ].join(` `));
// break;
case "packages":
filter = getFilterClause(`PACKAGE_NAME`, details.filter);
selects.push(
[
`select '${type}' as OBJ_TYPE, '' as TABLE_TYPE, PACKAGE_NAME as NAME, PACKAGE_TEXT as TEXT, SYSTEM_PACKAGE_NAME as SYS_NAME, SYSTEM_PACKAGE_SCHEMA as SYS_SCHEMA, '' as SPECNAME, PACKAGE_SCHEMA as BASE_SCHEMA, PROGRAM_NAME as BASE_OBJ`,
`from QSYS2.SYSPACKAGE`,
`where PACKAGE_SCHEMA = ? ${filter.clause}`,
].join(` `)
);

parameters.push(schema, ...filter.parameters);
break;

case `triggers`:
filter = getFilterClause(`TRIGGER_NAME`, details.filter);
Expand Down
Loading
Loading