@quillsql/node 0.5.7 → 0.5.9

package/dist/db/CachedConnection.d.ts

@@ -2,15 +2,17 @@ import { Mapable, CacheCredentials } from "../models/Cache";
 import { DatabaseConnection } from "./DatabaseHelper";
 export declare class CachedConnection {
     databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql";
-    pool: DatabaseConnection;
+    pool: DatabaseConnection | null;
     orgId: any;
     ttl: number;
     cache: Mapable | null;
+    private config;
     constructor(databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql", config: any, cacheConfig?: Partial<CacheCredentials>);
     query(text: string, values?: any[]): Promise<any>;
     /**
      * Configures and returns a cache instance or null if none could be created.
      */
     private getCache;
+    getPool(): DatabaseConnection;
     close(): Promise<void>;
 }

package/dist/db/CachedConnection.js

@@ -29,12 +29,14 @@ class CachedConnection {
         var _a;
         this.databaseType = databaseType;
         this.pool = (0, DatabaseHelper_1.connectToDatabase)(databaseType, config);
+        this.config = config;
         this.ttl = (_a = cacheConfig === null || cacheConfig === void 0 ? void 0 : cacheConfig.ttl) !== null && _a !== void 0 ? _a : DEFAULT_CACHE_TTL;
         this.cache = this.getCache(cacheConfig);
     }
     query(text, values) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                this.pool = this.getPool();
                 if (!this.cache) {
                     return yield (0, DatabaseHelper_1.runQueryByDatabase)(this.databaseType, this.pool, text);
                 }
@@ -58,6 +60,11 @@ class CachedConnection {
                     throw new Error(err.message);
                 }
             }
+            finally {
+                if (this.databaseType.toLowerCase() === "mysql") {
+                    this.close();
+                }
+            }
         });
     }
     /**
@@ -72,9 +79,18 @@ class CachedConnection {
         }
         return null;
     }
+    getPool() {
+        if (!this.pool) {
+            this.pool = (0, DatabaseHelper_1.connectToDatabase)(this.databaseType, this.config);
+        }
+        return this.pool;
+    }
     close() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield (0, DatabaseHelper_1.disconnectFromDatabase)(this.databaseType, this.pool);
+            if (this.pool) {
+                (0, DatabaseHelper_1.disconnectFromDatabase)(this.databaseType, this.pool);
+                this.pool = null;
+            }
         });
     }
 }

package/dist/db/Mysql.d.ts

@@ -5,6 +5,7 @@ export interface MysqlConnectionConfig {
     user: string;
     password: string;
     database: string;
+    port: number;
 }
 export declare function formatMysqlConfig(connectionString: string): MysqlConnectionConfig;
 export declare function connectToMysql(config: MysqlConnectionConfig): MysqlPool;

package/dist/db/Mysql.js

@@ -24,11 +24,12 @@ function formatMysqlConfig(connectionString) {
         user: user || "",
         password: password || "",
         database: (parsedUrl.pathname || "").slice(1),
+        port: parsedUrl.port ? parseInt(parsedUrl.port) : 3306,
     };
 }
 exports.formatMysqlConfig = formatMysqlConfig;
 function connectToMysql(config) {
-    const pool = mysql2_1.default.createPool(Object.assign(Object.assign({}, config), { waitForConnections: true, connectionLimit: 10, queueLimit: 0 }));
+    const pool = mysql2_1.default.createPool(Object.assign(Object.assign({}, config), { waitForConnections: true, connectionLimit: 128, queueLimit: 0 }));
     return pool;
 }
 exports.connectToMysql = connectToMysql;
@@ -166,6 +167,10 @@ function mysqlTextDataTypeToPostgresOID(type) {
             return 1043;
         case "timestamp": // date
             return 1082;
+        case "date": // date
+            return 1082;
+        case "datetime": // date
+            return 1082;
         default: // varchar
             return 1043;
     }
@@ -184,7 +189,9 @@ function mysqlDataTypeIdToPostgresType(type) {
             return 1043;
         case 7: // date
             return 1082;
-        case 7: // date
+        case 10: // date
+            return 1082;
+        case 12: // date
             return 1082;
         default: // varchar
             return 1043;

package/dist/index.js

@@ -167,8 +167,9 @@ class Quill {
                 }
             }
             else if (runQueryConfig === null || runQueryConfig === void 0 ? void 0 : runQueryConfig.getTables) {
-                const queryResult = yield (0, DatabaseHelper_1.getTablesBySchemaByDatabase)(this.targetConnection.databaseType, this.targetConnection.pool, runQueryConfig.schemaNames || runQueryConfig.schema);
-                const schemaInfo = yield (0, DatabaseHelper_1.getColumnInfoBySchemaByDatabase)(this.targetConnection.databaseType, this.targetConnection.pool, runQueryConfig.schema, queryResult);
+                const queryResult = yield (0, DatabaseHelper_1.getTablesBySchemaByDatabase)(this.targetConnection.databaseType, this.targetConnection.getPool(), runQueryConfig.schemaNames || runQueryConfig.schema);
+                const schemaInfo = yield (0, DatabaseHelper_1.getColumnInfoBySchemaByDatabase)(this.targetConnection.databaseType, this.targetConnection.getPool(), runQueryConfig.schema, queryResult);
+                this.targetConnection.close();
                 return schemaInfo;
             }
             else {

package/package.json

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

package/src/db/CachedConnection.ts

@@ -29,24 +29,27 @@ const DEFAULT_CACHE_TTL = 24 * 60 * 60;
 
 export class CachedConnection {
   public databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql";
-  public pool: DatabaseConnection;
+  public pool: DatabaseConnection | null;
   public orgId: any;
   public ttl: number;
   public cache: Mapable | null;
+  private config: any;
 
   constructor(
     databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql",
     config: any,
-    cacheConfig: Partial<CacheCredentials> = {}
+    cacheConfig: Partial<CacheCredentials> = {},
   ) {
     this.databaseType = databaseType;
     this.pool = connectToDatabase(databaseType, config);
+    this.config = config;
     this.ttl = cacheConfig?.ttl ?? DEFAULT_CACHE_TTL;
     this.cache = this.getCache(cacheConfig);
   }
 
   public async query(text: string, values?: any[]): Promise<any> {
     try {
+      this.pool = this.getPool();
       if (!this.cache) {
         return await runQueryByDatabase(this.databaseType, this.pool, text);
       }
@@ -58,7 +61,7 @@ export class CachedConnection {
         const newResult = await runQueryByDatabase(
           this.databaseType,
           this.pool,
-          text
+          text,
         );
         const newResultString: string = JSON.stringify(newResult);
         await this.cache.set(key, newResultString, "EX", DEFAULT_CACHE_TTL);
@@ -69,11 +72,15 @@ export class CachedConnection {
         throw new PgError(
           (err as any).detail,
           (err as any).hint,
-          (err as any).position
+          (err as any).position,
         );
       } else if (err instanceof Error) {
         throw new Error(err.message);
       }
+    } finally {
+      if (this.databaseType.toLowerCase() === "mysql") {
+        this.close();
+      }
     }
   }
 
@@ -89,14 +96,24 @@ export class CachedConnection {
   }: QuillConfig["cache"]): Mapable | null {
     if (cacheType === "redis" || cacheType === "rediss") {
       const redisURL = `${cacheType}://${username}:${password}@${host}:${port}`;
-      const client =  createClient({ url: redisURL });
+      const client = createClient({ url: redisURL });
       client.connect();
       return client as Mapable;
     }
     return null;
   }
 
+  public getPool() {
+    if (!this.pool) {
+      this.pool = connectToDatabase(this.databaseType, this.config);
+    }
+    return this.pool;
+  }
+
   async close() {
-    await disconnectFromDatabase(this.databaseType, this.pool);
+    if (this.pool) {
+      disconnectFromDatabase(this.databaseType, this.pool);
+      this.pool = null;
+    }
   }
 }

package/src/db/Mysql.ts

@@ -10,10 +10,11 @@ export interface MysqlConnectionConfig {
   user: string;
   password: string;
   database: string;
+  port: number;
 }
 
 export function formatMysqlConfig(
-  connectionString: string
+  connectionString: string,
 ): MysqlConnectionConfig {
   const parsedUrl = url.parse(connectionString);
   const [user, password] = (parsedUrl.auth || "").split(":");
@@ -22,6 +23,7 @@ export function formatMysqlConfig(
     user: user || "",
     password: password || "",
     database: (parsedUrl.pathname || "").slice(1),
+    port: parsedUrl.port ? parseInt(parsedUrl.port) : 3306,
   };
 }
 
@@ -29,7 +31,7 @@ export function connectToMysql(config: MysqlConnectionConfig): MysqlPool {
   const pool = mysql.createPool({
     ...config,
     waitForConnections: true,
-    connectionLimit: 10,
+    connectionLimit: 128,
     queueLimit: 0,
   });
   return pool;
@@ -41,7 +43,7 @@ export function disconnectFromMysql(connection: MysqlPool) {
 
 export async function runQueryMysql(
   sql: string,
-  connection: MysqlPool
+  connection: MysqlPool,
 ): Promise<QuillQueryResults> {
   const result: QuillQueryResults = await new Promise((resolve, reject) => {
     connection.query(sql, (error, results, fields) => {
@@ -70,7 +72,7 @@ export async function runQueryMysql(
 }
 
 export async function getSchemasMysql(
-  connection: MysqlPool
+  connection: MysqlPool,
 ): Promise<string[]> {
   const sql = `SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA
     WHERE schema_name != 'information_schema' 
@@ -82,7 +84,7 @@ export async function getSchemasMysql(
 
 export async function getTablesBySchemaMysql(
   connection: MysqlPool,
-  schemaNames: string[]
+  schemaNames: string[],
 ): Promise<{ tableName: string; schemaName: string }[]> {
   const allColumns = await Promise.all(
     schemaNames.map(async (schema) => {
@@ -91,7 +93,7 @@ export async function getTablesBySchemaMysql(
       return results.rows.map((row) => {
         return { tableName: row.TABLE_NAME, schemaName: row.TABLE_SCHEMA };
       });
-    })
+    }),
   );
   return allColumns.flat();
 }
@@ -99,7 +101,7 @@ export async function getTablesBySchemaMysql(
 export async function getColumnsByTableMysql(
   connection: MysqlPool,
   schemaName: string,
-  tableName: string
+  tableName: string,
 ): Promise<string[]> {
   const sql = `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '${schemaName}' AND TABLE_NAME = '${tableName}'`;
   const results = await runQueryMysql(sql, connection);
@@ -110,7 +112,7 @@ export async function getForeignKeysMysql(
   connection: MysqlPool,
   schemaName: string,
   tableName: string,
-  primaryKey: string
+  primaryKey: string,
 ): Promise<string[]> {
   const depluralizedTableName = depluralize(tableName);
   let sql = `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS 
@@ -125,7 +127,7 @@ export async function getForeignKeysMysql(
   });
   // remove any foreignKeyStrings that are just 'id'
   foreignKeysString = foreignKeysString.filter(
-    (key) => key !== "id" && key !== "_id_"
+    (key) => key !== "id" && key !== "_id_",
   );
   foreignKeysString = [...new Set(foreignKeysString)];
   if (foreignKeysString.length === 0) {
@@ -149,7 +151,7 @@ export async function getForeignKeysMysql(
 export async function getSchemaColumnInfoMysql(
   connection: MysqlPool,
   schemaName: string,
-  tableNames:  { tableName: string; schemaName: string }[]
+  tableNames: { tableName: string; schemaName: string }[],
 ): Promise<
   { tableName: string; columns: { columnName: string; dataTypeID: number }[] }[]
 > {
@@ -172,7 +174,7 @@ export async function getSchemaColumnInfoMysql(
           fieldType: row.dataType,
         })),
       };
-    })
+    }),
   );
   return allColumns;
 }
@@ -189,6 +191,10 @@ function mysqlTextDataTypeToPostgresOID(type: string): number {
       return 1043;
     case "timestamp": // date
       return 1082;
+    case "date": // date
+      return 1082;
+    case "datetime": // date
+      return 1082;
     default: // varchar
       return 1043;
   }
@@ -208,7 +214,9 @@ function mysqlDataTypeIdToPostgresType(type: number): number {
       return 1043;
     case 7: // date
       return 1082;
-    case 7: // date
+    case 10: // date
+      return 1082;
+    case 12: // date
       return 1082;
     default: // varchar
       return 1043;

package/src/index.ts

@@ -76,13 +76,13 @@ export class Quill {
     if (databaseConnectionString) {
       credentials = getDatabaseCredentials(
         databaseType,
-        databaseConnectionString
+        databaseConnectionString,
       );
     }
     this.targetConnection = new CachedConnection(
       databaseType,
       credentials,
-      cache || {}
+      cache || {},
     );
   }
 
@@ -98,7 +98,7 @@ export class Quill {
             metadata.preQueries,
             this.targetConnection.databaseType,
             metadata.databaseType,
-            metadata.runQueryConfig
+            metadata.runQueryConfig,
           )
         : {};
       if (metadata.runQueryConfig?.overridePost) {
@@ -124,7 +124,7 @@ export class Quill {
         response.queries,
         this.targetConnection.databaseType,
         metadata.databaseType,
-        responseMetadata.runQueryConfig
+        responseMetadata.runQueryConfig,
       );
       // QUICK JANKY FIX TO UPDATE METADATA AFTER GETTING MAPPED ARRAYS
       if (results.mappedArray && responseMetadata.runQueryConfig?.arrayToMap) {
@@ -163,7 +163,7 @@ export class Quill {
     queries: any[] | undefined,
     pkDatabaseType: "postgresql" | "snowflake" | "bigquery" | "mysql",
     databaseType?: string,
-    runQueryConfig?: AdditionalProcessing
+    runQueryConfig?: AdditionalProcessing,
   ) {
     let results: any;
     if (!queries) return { ...results, queryResults: [] };
@@ -182,7 +182,7 @@ export class Quill {
       return { ...results, queryResults: [], mappedArray };
     } else if (runQueryConfig?.getColumns) {
       const queryResult = await this.targetConnection.query(
-        `${queries[0].replace(/;/, "")} limit 1`
+        `${queries[0].replace(/;/, "")} limit 1`,
       );
       const columns = queryResult.fields.map((field: any) => {
         return {
@@ -209,7 +209,7 @@ export class Quill {
           }
           try {
             const queryResult = await this.targetConnection.query(
-              `${table.viewQuery.replace(/;/, "")} ${limit}`
+              `${table.viewQuery.replace(/;/, "")} ${limit}`,
             );
             const columns = queryResult.fields.map((field: any) => {
               return {
@@ -224,7 +224,7 @@ export class Quill {
           } catch (err) {
             return { ...table, error: "Error fetching columns" };
           }
-        })
+        }),
       );
       results = { ...results, queryResults };
       if (runQueryConfig?.fieldsToRemove) {
@@ -241,15 +241,16 @@ export class Quill {
     } else if (runQueryConfig?.getTables) {
       const queryResult = await getTablesBySchemaByDatabase(
         this.targetConnection.databaseType,
-        this.targetConnection.pool,
-        runQueryConfig.schemaNames! || runQueryConfig.schema
+        this.targetConnection.getPool(),
+        runQueryConfig.schemaNames! || runQueryConfig.schema,
       );
       const schemaInfo = await getColumnInfoBySchemaByDatabase(
         this.targetConnection.databaseType,
-        this.targetConnection.pool,
+        this.targetConnection.getPool(),
         runQueryConfig.schema!,
-        queryResult!
+        queryResult!,
       );
+      this.targetConnection.close();
       return schemaInfo;
     } else {
       if (runQueryConfig?.limitThousand) {
@@ -264,7 +265,7 @@ export class Quill {
       const queryResults = await Promise.all(
         queries.map(async (query) => {
           return await this.targetConnection.query(query);
-        })
+        }),
       );
       results = { ...results, queryResults };
       if (runQueryConfig?.fieldsToRemove) {
@@ -298,12 +299,12 @@ export class Quill {
 
   private async postQuill(
     path: string,
-    payload: any
+    payload: any,
   ): Promise<QuillClientResponse> {
     const response = await axios.post(
       `${this.baseUrl}/sdk/${path}`,
       payload,
-      this.config
+      this.config,
     );
     return response.data;
   }