@quillsql/node 0.4.0 → 0.4.2

package/dist/db/BigQuery.js

@@ -173,9 +173,18 @@ function inferType(elem) {
         // Check if the number is a float or an integer
         return Number.isInteger(elem) ? 23 : 700; // 23: integer, 700: real
     }
+    // BIG QUERY places data into objects as well
     if (typeof elem === "object") {
         if (/^\d{4}-\d{2}-\d{2}$/.test(elem.value))
-            return 1082; // date
+            return 1082; // YYYY-MM-DD format
+        if (/^\d{2}\/\d{2}\/\d{2,4}$/.test(elem.value))
+            return 1082; // MM\DD\YYYY or MM\DD\YY format
+        if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?$/.test(elem.value))
+            return 1114; // YYYY-MM-DDTHH:MM:SS[.fraction] format
+        if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?Z$/.test(elem.value))
+            return 1184; // YYYY-MM-DDTHH:MM:SS[.fraction]Z format
+        if (/^\d{2}:\d{2}:\d{2}$/.test(elem.value))
+            return 1083; // HH:MM:SS format
     }
     if (typeof elem === "string") {
         // Attempt to infer date, time, and timestamp formats

package/dist/index.js

@@ -49,6 +49,9 @@ class QuillClass {
                     };
                 }
                 const response = yield this.postQuill(metadata.task, Object.assign(Object.assign(Object.assign({}, metadata), preQueryResults), { orgId, viewQuery: metadata.preQueries ? metadata.preQueries[0] : undefined }));
+                if (response.error) {
+                    return { status: "error", error: response.error };
+                }
                 // if there is no metadata object in the response, create one
                 if (!response.metadata) {
                     response.metadata = {};
@@ -103,7 +106,7 @@ class QuillClass {
                 return Object.assign(Object.assign({}, results), { queryResults: [], mappedArray });
             }
             else if (runQueryConfig === null || runQueryConfig === void 0 ? void 0 : runQueryConfig.getColumns) {
-                const queryResult = yield this.targetConnection.query(`${queries[0]} limit 1`);
+                const queryResult = yield this.targetConnection.query(`${queries[0].replace(/;/, "")} limit 1`);
                 const columns = queryResult.fields.map((field) => {
                     return {
                         fieldType: (0, schemaConversion_1.convertTypeToPostgres)(field.dataTypeID),
@@ -126,6 +129,11 @@ class QuillClass {
                         return query.replace(/;/, "") + " limit 1000;";
                     });
                 }
+                else if (runQueryConfig === null || runQueryConfig === void 0 ? void 0 : runQueryConfig.limitBy) {
+                    queries = queries.map((query) => {
+                        return query.replace(/;/, "") + " limit " + runQueryConfig.limitBy;
+                    });
+                }
                 const queryResults = yield Promise.all(queries.map((query) => __awaiter(this, void 0, void 0, function* () {
                     return yield this.targetConnection.query(query);
                 })));

package/examples/node-server/app.ts

@@ -4,7 +4,7 @@ import express from "express";
 import cors from "cors";
 
 const app = express();
-const port = 3001;
+const port = 3000;
 
 // postgresqlConfigExample {
 //   connectionString: process.env.DB_URL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/node",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Quill's client SDK for node backends.",
   "main": "dist/index.js",
   "module": "./dist/index.js",
@@ -36,4 +36,4 @@
     "snowflake-sdk": "^1.9.3",
     "ts-jest": "^29.1.1"
   }
-}
+}

package/src/db/BigQuery.ts

@@ -190,8 +190,15 @@ function inferType(elem: any) {
     // Check if the number is a float or an integer
     return Number.isInteger(elem) ? 23 : 700; // 23: integer, 700: real
   }
+  // BIG QUERY places data into objects as well
   if (typeof elem === "object") {
-    if (/^\d{4}-\d{2}-\d{2}$/.test(elem.value)) return 1082; // date
+    if (/^\d{4}-\d{2}-\d{2}$/.test(elem.value)) return 1082; // YYYY-MM-DD format
+    if (/^\d{2}\/\d{2}\/\d{2,4}$/.test(elem.value)) return 1082; // MM\DD\YYYY or MM\DD\YY format
+    if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?$/.test(elem.value))
+      return 1114; // YYYY-MM-DDTHH:MM:SS[.fraction] format
+    if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?Z$/.test(elem.value))
+      return 1184; // YYYY-MM-DDTHH:MM:SS[.fraction]Z format
+    if (/^\d{2}:\d{2}:\d{2}$/.test(elem.value)) return 1083; // HH:MM:SS format
   }
   if (typeof elem === "string") {
     // Attempt to infer date, time, and timestamp formats

package/src/index.ts

@@ -88,6 +88,9 @@ export default class QuillClass {
         orgId,
         viewQuery: metadata.preQueries ? metadata.preQueries[0] : undefined,
       });
+      if (response.error) {
+        return { status: "error", error: response.error };
+      }
       // if there is no metadata object in the response, create one
       if (!response.metadata) {
         response.metadata = {};
@@ -153,7 +156,7 @@ export default class QuillClass {
       return { ...results, queryResults: [], mappedArray };
     } else if (runQueryConfig?.getColumns) {
       const queryResult = await this.targetConnection.query(
-        `${queries[0]} limit 1`
+        `${queries[0].replace(/;/, "")} limit 1`
       );
       const columns = queryResult.fields.map((field: any) => {
         return {
@@ -183,6 +186,10 @@ export default class QuillClass {
         queries = queries.map((query) => {
           return query.replace(/;/, "") + " limit 1000;";
         });
+      } else if (runQueryConfig?.limitBy) {
+        queries = queries.map((query) => {
+          return query.replace(/;/, "") + " limit " + runQueryConfig.limitBy;
+        });
       }
       const queryResults = await Promise.all(
         queries.map(async (query) => {

package/src/models/Quill.ts

@@ -26,7 +26,7 @@ export interface QuillRequestMetadata {
   template?: boolean;
   clientId?: string;
   deleted?: boolean;
-  databaseType?: string
+  databaseType?: string;
 }
 
 export interface QuillQueryParams {
@@ -55,18 +55,20 @@ export interface AdditionalProcessing {
   getSchema?: boolean;
   getColumns?: boolean;
   getTables?: boolean;
-  schema?: string,
+  schema?: string;
   schemaNames?: string[];
-  table?: string,
+  table?: string;
   removeFields?: string[];
   arrayToMap?: { arrayName: string; field: string };
   overridePost?: boolean;
-  convertDatatypes?: boolean
+  convertDatatypes?: boolean;
   limitThousand?: boolean;
+  limitBy?: number;
 }
 
 export interface QuillClientResponse {
   queries: string[];
   metadata: any;
   runQueryConfig: AdditionalProcessing;
+  error?: string;
 }