Merge pull request #300 from codefori/feature/editable_columns

Editable cells

Author: worksofliam

package-lock.json

@@ -2,7 +2,7 @@
   "name": "vscode-db2i",
   "displayName": "Db2 for IBM i",
   "description": "Db2 for IBM i tools in VS Code",
-  "version": "1.6.3",
+  "version": "1.6.3-scott12",
   "engines": {
     "vscode": "^1.95.0"
   },

package.json

@@ -1,8 +1,6 @@
 
-import vscode from "vscode"
 import { JobManager } from "../config";
 import { getInstance } from "../base";
-import Statement from "./statement";
 
 export default class Table {
   /**
@@ -32,11 +30,46 @@ export default class Table {
       `    column.table_schema = key.table_schema and`,
       `    column.table_name = key.table_name and`,
       `    column.column_name = key.column_name`,
-      `WHERE column.TABLE_SCHEMA = '${schema}' AND column.TABLE_NAME = '${name}'`,
+      `WHERE column.TABLE_SCHEMA = ? AND column.TABLE_NAME = ?`,
       `ORDER BY column.ORDINAL_POSITION`,
     ].join(` `);
 
-    return JobManager.runSQL(sql);
+    return JobManager.runSQL(sql, {parameters: [schema, name]});
+  }
+
+  /**
+   * This is to be used instead of getItems when the table is in session/QTEMP
+   */
+  static async getSessionItems(name: string): Promise<TableColumn[]> {
+    const sql = [
+      `SELECT `,
+      `  column.TABLE_SCHEMA,`,
+      `  column.TABLE_NAME,`,
+      `  column.COLUMN_NAME,`,
+      `  '' as CONSTRAINT_NAME,`,
+      `  column.DATA_TYPE, `,
+      `  column.CHARACTER_MAXIMUM_LENGTH,`,
+      `  column.NUMERIC_SCALE, `,
+      `  column.NUMERIC_PRECISION,`,
+      `  column.IS_NULLABLE, `,
+      `  column.HAS_DEFAULT, `,
+      `  column.COLUMN_DEFAULT, `,
+      `  column.COLUMN_TEXT, `,
+      `  column.IS_IDENTITY`,
+      `FROM QSYS2.SYSCOLUMNS2_SESSION as column`,
+      `WHERE column.TABLE_NAME = ?`,
+      `ORDER BY column.ORDINAL_POSITION`,
+    ].join(` `);
+
+    return JobManager.runSQL(sql, {parameters: [name]});
+  }
+
+  static async isPartitioned(schema: string, name: string): Promise<boolean> {
+    const sql = `select table_name, partitioned_table from qsys2.sysfiles where table_schema = ? and table_name = ? and partitioned_table is not null and partitioned_table = 'YES'`;
+    const parameters = [schema, name];
+
+    const result = await JobManager.runSQL(sql, {parameters});
+    return result.length > 0;
   }
 
   static async clearFile(library: string, objectName: string): Promise<void> {

src/database/table.ts

@@ -20,7 +20,7 @@ export default class Statement {
 			first = this.tokens[2];
 		}
 
-		if (tokenIs(first, `word`) && tokenIs(this.tokens[1], `colon`)) {
+		if (first.value !== undefined && tokenIs(this.tokens[1], `colon`)) {
 			// Possible label?
 			this.label = first.value;
 			first = this.tokens[2];

src/language/sql/statement.ts

@@ -9,7 +9,7 @@ export function getHeader(options: {withCollapsed?: boolean} = {}): string {
       border-collapse: collapse;
       font-size: 0.9em;
       font-family: sans-serif;
-      min-width: 400px;
+      min-width: 100%;
     }
 
     thead tr {
@@ -20,11 +20,14 @@ export function getHeader(options: {withCollapsed?: boolean} = {}): string {
       top: 0;           /* Don't forget this, required for the stickiness */
     }
 
+    tfoot {
+      position: sticky;
+      bottom: 0;
+    }
+
     tfoot tr {
       background-color: var(--vscode-multiDiffEditor-headerBackground);
       text-align: left;
-      position: sticky; /* Lock the footer row to the bottom so it's always visible as rows are scrolled */
-      bottom: 0;        /* Don't forget this, required for the stickiness */
     }
 
     #resultset th,