npm - @quillsql/node - Versions diffs - 0.5.3 → 0.5.5 - Mend

@quillsql/node 0.5.3 → 0.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/index.js CHANGED Viewed

@@ -126,24 +126,30 @@ class Quill {
             }
             else if (runQueryConfig === null || runQueryConfig === void 0 ? void 0 : runQueryConfig.getColumnsForSchema) {
                 const queryResults = yield Promise.all(queries.map((table) => __awaiter(this, void 0, void 0, function* () {
-                    if (!table.viewQuery) {
+                    if (!table.viewQuery ||
+                        (!table.isSelectStar && !table.customFieldInfo)) {
                         return table;
                     }
                     let limit = "";
                     if (runQueryConfig.limitBy) {
                         limit = ` limit ${runQueryConfig.limitBy}`;
                     }
-                    const queryResult = yield this.targetConnection.query(`${table.viewQuery.replace(/;/, "")} ${limit}`);
-                    const columns = queryResult.fields.map((field) => {
-                        return {
-                            fieldType: (0, schemaConversion_1.convertTypeToPostgres)(field.dataTypeID),
-                            name: field.name,
-                            displayName: field.name,
-                            isVisible: true,
-                            field: field.name,
-                        };
-                    });
-                    return Object.assign(Object.assign({}, table), { columns: columns, rows: queryResult.rows });
+                    try {
+                        const queryResult = yield this.targetConnection.query(`${table.viewQuery.replace(/;/, "")} ${limit}`);
+                        const columns = queryResult.fields.map((field) => {
+                            return {
+                                fieldType: (0, schemaConversion_1.convertTypeToPostgres)(field.dataTypeID),
+                                name: field.name,
+                                displayName: field.name,
+                                isVisible: true,
+                                field: field.name,
+                            };
+                        });
+                        return Object.assign(Object.assign({}, table), { columns: columns, rows: queryResult.rows });
+                    }
+                    catch (err) {
+                        return Object.assign(Object.assign({}, table), { error: "Error fetching columns" });
+                    }
                 })));
                 results = Object.assign(Object.assign({}, results), { queryResults });
                 if (runQueryConfig === null || runQueryConfig === void 0 ? void 0 : runQueryConfig.fieldsToRemove) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/node",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "Quill Server SDK for Node.js",
   "main": "dist/index.js",
   "module": "./dist/index.js",

package/src/index.ts CHANGED Viewed

@@ -195,26 +195,33 @@ export class Quill {
     } else if (runQueryConfig?.getColumnsForSchema) {
       const queryResults = await Promise.all(
         queries.map(async (table) => {
-          if (!table.viewQuery) {
+          if (
+            !table.viewQuery ||
+            (!table.isSelectStar && !table.customFieldInfo)
+          ) {
             return table;
           }
           let limit = "";
           if (runQueryConfig.limitBy) {
             limit = ` limit ${runQueryConfig.limitBy}`;
           }
-          const queryResult = await this.targetConnection.query(
-            `${table.viewQuery.replace(/;/, "")} ${limit}`
-          );
-          const columns = queryResult.fields.map((field: any) => {
-            return {
-              fieldType: convertTypeToPostgres(field.dataTypeID),
-              name: field.name,
-              displayName: field.name,
-              isVisible: true,
-              field: field.name,
-            };
-          });
-          return { ...table, columns: columns, rows: queryResult.rows };
+          try {
+            const queryResult = await this.targetConnection.query(
+              `${table.viewQuery.replace(/;/, "")} ${limit}`
+            );
+            const columns = queryResult.fields.map((field: any) => {
+              return {
+                fieldType: convertTypeToPostgres(field.dataTypeID),
+                name: field.name,
+                displayName: field.name,
+                isVisible: true,
+                field: field.name,
+              };
+            });
+            return { ...table, columns: columns, rows: queryResult.rows };
+          } catch (err) {
+            return { ...table, error: "Error fetching columns" };
+          }
         })
       );
       results = { ...results, queryResults };