Initial work for support parameters

Signed-off-by: worksofliam <mrliamallan@live.co.uk>

Author: worksofliam

package-lock.json

@@ -2,6 +2,7 @@ import { Webview } from "vscode";
 import { getHeader } from "../html";
 
 import Configuration from "../../configuration";
+import { SqlParameter } from "./resultSetPanelProvider";
 
 export function setLoadingText(webview: Webview, text: string) {
   webview.postMessage({
@@ -294,7 +295,7 @@ document.getElementById('resultset').onclick = function(e){
 };
 `;
 
-export function generateScroller(basicSelect: string, isCL: boolean, withCancel?: boolean, updatable?: UpdatableInfo): string {
+export function generateScroller(basicSelect: string, parameters: SqlParameter[] = [], isCL: boolean = false, withCancel: boolean = false, updatable?: UpdatableInfo): string {
   const withCollapsed = Configuration.get<boolean>('collapsedResultSet');
 
   return /*html*/`
@@ -417,6 +418,7 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
             isFetching = true;
             vscode.postMessage({
               query: basicSelect,
+              parameters: ${JSON.stringify(parameters)},
               isCL: ${isCL},
               queryId: myQueryId
             });

src/views/results/html.ts

@@ -20,7 +20,7 @@ import { ExplainType } from "../../connection/types";
 import { queryResultToRpgDs } from "./codegen";
 import Configuration from "../../configuration";
 
-export type StatementQualifier = "statement" | "update" | "explain" | "onlyexplain" | "json" | "csv" | "cl" | "sql" | "rpg";
+export type StatementQualifier = "statement" | "bind" | "update" | "explain" | "onlyexplain" | "json" | "csv" | "cl" | "sql" | "rpg";
 
 export interface StatementInfo {
   content: string,
@@ -333,10 +333,13 @@ async function runHandler(options?: StatementInfo) {
             if (inWindow) {
               useWindow(`CL results`, options.viewColumn);
             }
-            chosenView.setScrolling(statementDetail.content, true); // Never errors
+            chosenView.setScrolling({
+              basicSelect: statementDetail.content,
+              isCL: true,
+            }); // Never errors
           }
 
-        } else if ([`statement`, `update`].includes(statementDetail.qualifier)) {
+        } else if ([`statement`, `update`, `cl`].includes(statementDetail.qualifier)) {
           // If it's a basic statement, we can let it scroll!
           if (statementDetail.noUi) {
             setCancelButtonVisibility(true);
@@ -353,7 +356,11 @@ async function runHandler(options?: StatementInfo) {
               updatableTable = refs[0];
             }
 
-            chosenView.setScrolling(statementDetail.content, false, undefined, inWindow, updatableTable); // Never errors
+            chosenView.setScrolling({ // Never errors
+              basicSelect: statementDetail.content,
+              withCancel: inWindow,
+              ref: updatableTable,
+            })
           }
 
         } else if ([`explain`, `onlyexplain`].includes(statementDetail.qualifier)) {
@@ -372,7 +379,10 @@ async function runHandler(options?: StatementInfo) {
             if (onlyExplain) {
               chosenView.setLoadingText(`Explained.`, false);
             } else {
-              chosenView.setScrolling(statementDetail.content, false, explained.id); // Never errors
+              chosenView.setScrolling({ // Never errors
+                basicSelect: statementDetail.content,
+                queryId: explained.id,
+              })
             }
 
             explainTree = new ExplainTree(explained.vedata);

src/views/results/index.ts

@@ -11,6 +11,17 @@ import Table from "../../database/table";
 import Statement from "../../database/statement";
 import { TableColumn } from "../../types";
 
+export type SqlParameter = string|number;
+
+export interface ScrollerOptions {
+  basicSelect: string;
+  parameters?: SqlParameter[];
+  isCL?: boolean;
+  queryId?: string;
+  withCancel?: boolean;
+  ref?: ObjectRef;
+}
+
 export class ResultSetPanelProvider implements WebviewViewProvider {
   _view: WebviewView | WebviewPanel;
   loadingState: boolean;
@@ -193,17 +204,17 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
     }
   }
 
-  async setScrolling(basicSelect: string, isCL = false, queryId: string = ``, withCancel = false, ref?: ObjectRef) {
+  async setScrolling(options: ScrollerOptions) {
     this.loadingState = false;
     await this.focus();
 
     let updatable: html.UpdatableInfo | undefined;
 
-    if (ref) {
-      const schema = ref.object.schema || ref.object.system;
+    if (options.ref) {
+      const schema = options.ref.object.schema || options.ref.object.system;
       if (schema) {
         const goodSchema = Statement.delimName(schema, true);
-        const goodName = Statement.delimName(ref.object.name, true);
+        const goodName = Statement.delimName(options.ref.object.name, true);
 
         try {
           const isPartitioned = await Table.isPartitioned(goodSchema, goodName);
@@ -234,16 +245,16 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
                 }));
 
               if (!currentColumns.some(c => c.useInWhere)) {
-                const cName = ref.alias || `t`;
+                const cName = options.ref.alias || `t`;
 
                 // Support for using a custom column list
-                const selectClauseStart = basicSelect.toLowerCase().indexOf(`select `);
-                const fromClauseStart = basicSelect.toLowerCase().indexOf(`from`);
+                const selectClauseStart = options.basicSelect.toLowerCase().indexOf(`select `);
+                const fromClauseStart = options.basicSelect.toLowerCase().indexOf(`from`);
                 let possibleColumnList: string | undefined;
 
                 possibleColumnList = `${cName}.*`;
                 if (fromClauseStart > 0) {
-                  possibleColumnList = basicSelect.substring(0, fromClauseStart);
+                  possibleColumnList = options.basicSelect.substring(0, fromClauseStart);
                   if (selectClauseStart >= 0) {
                     possibleColumnList = possibleColumnList.substring(selectClauseStart + 7);
 
@@ -254,20 +265,20 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
                 }
 
                 // We need to override the input statement if they want to do updatable
-                const whereClauseStart = basicSelect.toLowerCase().indexOf(`where`);
+                const whereClauseStart = options.basicSelect.toLowerCase().indexOf(`where`);
                 let fromWhereClause: string | undefined;
 
                 if (whereClauseStart > 0) {
-                  fromWhereClause = basicSelect.substring(whereClauseStart);
+                  fromWhereClause = options.basicSelect.substring(whereClauseStart);
                 }
 
 
-                basicSelect = `select rrn(${cName}) as RRN, ${possibleColumnList} from ${schema}.${ref.object.name} as ${cName} ${fromWhereClause || ``}`;
+                options.basicSelect = `select rrn(${cName}) as RRN, ${possibleColumnList} from ${schema}.${options.ref.object.name} as ${cName} ${fromWhereClause || ``}`;
                 currentColumns = [{ name: `RRN`, jsType: `number`, useInWhere: true }, ...currentColumns];
               }
 
               updatable = {
-                table: schema + `.` + ref.object.name,
+                table: schema + `.` + options.ref.object.name,
                 columns: currentColumns
               };
             }
@@ -278,11 +289,11 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
       }
     }
 
-    this._view.webview.html = html.generateScroller(basicSelect, isCL, withCancel, updatable);
+    this._view.webview.html = html.generateScroller(options.basicSelect, options.parameters, options.isCL, options.withCancel, updatable);
 
     this._view.webview.postMessage({
       command: `fetch`,
-      queryId
+      queryId: options.queryId
     });
   }