Fallback to RRN if no uniques available

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

package.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-scott2",
   "engines": {
     "vscode": "^1.95.0"
   },

src/views/results/html.ts

@@ -119,6 +119,8 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
 
               if (trWithColumn && trWithColumn.column) {
                 const chosenColumn = trWithColumn.column;
+                if (chosenColumn === 'RRN') return;
+
                 const chosenColumnDetail = updateTable.columns.find(col => col.name === chosenColumn);
                 if (!chosenColumnDetail) return;
                 
@@ -158,8 +160,10 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
 
                   if (newValue === chosenValue) return;
 
+                  const useRrn = updateKeyColumns.length === 1 && updateKeyColumns.some(col => col.name === 'RRN');
+
                   let bindings = [];
-                  let updateStatement = 'UPDATE ' + updateTable.table + ' SET ' + chosenColumn + ' = ';
+                  let updateStatement = 'UPDATE ' + updateTable.table + ' t SET t.' + chosenColumn + ' = ';
 
                   if (newValue === 'null') {
                     updateStatement += 'NULL';
@@ -187,7 +191,13 @@ export function generateScroller(basicSelect: string, isCL: boolean, withCancel?
                   
                   for (let i = 0; i < updateKeyColumns.length; i++) {
                     if (idValues[i] === 'null') continue;
-                    updateStatement += updateKeyColumns[i].name + ' = ?';
+
+                    if (useRrn && updateKeyColumns[i].name === 'RRN') {
+                      updateStatement += 'RRN(t) = ?';
+                    } else {
+                      updateStatement += updateKeyColumns[i].name + ' = ?';
+                    }
+
                     switch (updateKeyColumns[i].jsType) {
                       case 'number':
                         bindings.push(Number(idValues[i]));

src/views/results/resultSetPanelProvider.ts

@@ -167,7 +167,7 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
     }
   }
 
-  async setScrolling(basicSelect, isCL = false, queryId: string = ``, withCancel = false, ref?: ObjectRef) {
+  async setScrolling(basicSelect: string, isCL = false, queryId: string = ``, withCancel = false, ref?: ObjectRef) {
     this.loadingState = false;
     await this.focus();
 
@@ -182,13 +182,21 @@ export class ResultSetPanelProvider implements WebviewViewProvider {
         );
 
         if (tableInfo.length > 0) {
-          var currentColumns: html.BasicColumn[]|undefined;
+          let currentColumns: html.BasicColumn[]|undefined;
 
           currentColumns = tableInfo.map((column) => ({name: column.COLUMN_NAME, jsType: column.NUMERIC_PRECISION ? `number` : `asString`, useInWhere: column.IS_IDENTITY === `YES` || column.CONSTRAINT_NAME !== null}));
 
           if (!currentColumns.some(c => c.useInWhere)) {
-            // Let's fallback and use all the columns in the where!
-            currentColumns = tableInfo.map((column) => ({name: column.COLUMN_NAME, jsType: column.NUMERIC_PRECISION ? `number` : `asString`, useInWhere: true}))
+            // We need to override the input statement if they want to do updatable
+            const whereClauseStart = basicSelect.toLowerCase().indexOf(`where`);
+            let fromWhereClause: string|undefined;
+
+            if (whereClauseStart > 0) {
+              fromWhereClause = basicSelect.substring(whereClauseStart);
+            }
+
+            basicSelect = `select rrn(t) as RRN, t.* from ${schema}.${ref.object.name} as t ${fromWhereClause || ``}`;
+            currentColumns = [{name: `RRN`, jsType: `number`, useInWhere: true}, ...currentColumns];
           }
 
           updatable = {