@quillsql/node 0.6.2 → 0.6.4

package/dist/db/DatabaseHelper.d.ts

@@ -19,7 +19,6 @@ export interface QuillQueryResults {
 export declare function getDatabaseCredentials(databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql", connectionString: string): PostgresConnectionConfig | SnowflakeConnectionConfig | BigQueryConfig | MysqlConnectionConfig;
 export declare function connectToDatabase(databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql", config: PostgresConnectionConfig | SnowflakeConnectionConfig | BigQueryConfig | MysqlConnectionConfig): DatabaseConnection;
 export declare function withConnection<T>(databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql", connectionString: string, callback: (connection: DatabaseConnection) => T): Promise<T>;
-export declare function withPool<T>(databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql", pool: DatabaseConnection, callback: (connection: DatabaseConnection) => T): Promise<T>;
 export declare function runQueryByDatabase(databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql", connection: DatabaseConnection, sql: string): Promise<QuillQueryResults> | undefined;
 export declare function connectAndRunQuery(databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql", connectionString: string, sql: string): Promise<QuillQueryResults | undefined>;
 export declare function disconnectFromDatabase(databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql", database: DatabaseConnection): void | Promise<void>;

package/dist/db/DatabaseHelper.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getColumnInfoBySchemaByDatabase = exports.getForiegnKeysByDatabase = exports.getColumnsByTableByDatabase = exports.getTablesBySchemaByDatabase = exports.getSchemasByDatabase = exports.disconnectFromDatabase = exports.connectAndRunQuery = exports.runQueryByDatabase = exports.withPool = exports.withConnection = exports.connectToDatabase = exports.getDatabaseCredentials = void 0;
+exports.getColumnInfoBySchemaByDatabase = exports.getForiegnKeysByDatabase = exports.getColumnsByTableByDatabase = exports.getTablesBySchemaByDatabase = exports.getSchemasByDatabase = exports.disconnectFromDatabase = exports.connectAndRunQuery = exports.runQueryByDatabase = exports.withConnection = exports.connectToDatabase = exports.getDatabaseCredentials = void 0;
 const Postgres_1 = require("./Postgres");
 const Snowflake_1 = require("./Snowflake");
 const BigQuery_1 = require("./BigQuery");
@@ -55,23 +55,15 @@ function withConnection(databaseType, connectionString, callback) {
         try {
             return yield callback(connection);
         }
+        catch (e) {
+            return new Promise((_, reject) => reject({ success: false, message: e.message || e.error || e }));
+        }
         finally {
             yield disconnectFromDatabase(databaseType, connection);
         }
     });
 }
 exports.withConnection = withConnection;
-function withPool(databaseType, pool, callback) {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            return yield callback(pool);
-        }
-        finally {
-            yield disconnectFromDatabase(databaseType, pool);
-        }
-    });
-}
-exports.withPool = withPool;
 function runQueryByDatabase(databaseType, connection, sql) {
     switch (databaseType.toLowerCase()) {
         case "postgres":

package/dist/db/Mysql.js

@@ -29,7 +29,7 @@ function formatMysqlConfig(connectionString) {
 }
 exports.formatMysqlConfig = formatMysqlConfig;
 function connectToMysql(config) {
-    const pool = mysql2_1.default.createPool(Object.assign(Object.assign({}, config), { waitForConnections: true, connectionLimit: 128, queueLimit: 0 }));
+    const pool = mysql2_1.default.createPool(Object.assign(Object.assign({}, config), { waitForConnections: true, connectionLimit: 24, queueLimit: 0 }));
     return pool;
 }
 exports.connectToMysql = connectToMysql;
@@ -157,43 +157,77 @@ function getSchemaColumnInfoMysql(connection, schemaName, tableNames) {
 exports.getSchemaColumnInfoMysql = getSchemaColumnInfoMysql;
 function mysqlTextDataTypeToPostgresOID(type) {
     switch (type) {
-        case "bigint": // int
-            return 23;
-        case "tinyint": // int
-            return 23;
-        case "float": // float
-            return 700;
-        case "varchar": // varchar
-            return 1043;
-        case "timestamp": // date
-            return 1082;
-        case "date": // date
-            return 1082;
-        case "datetime": // date
-            return 1082;
-        default: // varchar
-            return 1043;
+        case "bigint": // BIGINT in MySQL
+            return 20; // BIGINT in PostgreSQL
+        case "tinyint": // TINYINT in MySQL
+            return 21; // SMALLINT in PostgreSQL
+        case "smallint": // SMALLINT in MySQL
+            return 21; // SMALLINT in PostgreSQL
+        case "int": // INT in MySQL
+            return 23; // INTEGER in PostgreSQL
+        case "float": // FLOAT in MySQL
+            return 701; // DOUBLE PRECISION in PostgreSQL
+        case "double": // DOUBLE in MySQL
+            return 701; // DOUBLE PRECISION in PostgreSQL
+        case "varchar": // VARCHAR in MySQL
+            return 1043; // VARCHAR in PostgreSQL
+        case "char": // CHAR in MySQL
+            return 1042; // CHAR in PostgreSQL
+        case "timestamp": // TIMESTAMP in MySQL
+            return 1114; // TIMESTAMP in PostgreSQL
+        case "date": // DATE in MySQL
+            return 1082; // DATE in PostgreSQL
+        case "datetime": // DATETIME in MySQL
+            return 1114; // TIMESTAMP in PostgreSQL
+        case "time": // TIME in MySQL
+            return 1083; // TIME in PostgreSQL
+        case "year": // YEAR in MySQL
+            return 23; // INTEGER in PostgreSQL
+        case "binary": // BINARY in MySQL
+            return 17; // BYTEA in PostgreSQL
+        case "blob": // BLOB in MySQL
+            return 17; // BYTEA in PostgreSQL
+        case "text": // TEXT in MySQL
+            return 25; // TEXT in PostgreSQL
+        case "json": // JSON in MySQL
+            return 114; // JSON in PostgreSQL
+        default:
+            return 1043; // VARCHAR in PostgreSQL (fallback)
     }
 }
 function mysqlDataTypeIdToPostgresType(type) {
     switch (type) {
-        case 8: // int
-            return 23;
-        case 3: // int
-            return 23;
-        case 2: // int
-            return 23;
-        case 5: // float
-            return 700;
-        case 253: // varchar
-            return 1043;
-        case 7: // date
-            return 1082;
-        case 10: // date
-            return 1082;
-        case 12: // date
-            return 1082;
-        default: // varchar
-            return 1043;
+        case 0: // DECIMAL
+        case 1: // TINY
+        case 2: // SHORT
+        case 3: // LONG
+        case 8: // LONGLONG
+        case 9: // INT24
+        case 13: // YEAR
+            return 23; // INTEGER
+        case 4: // FLOAT
+        case 5: // DOUBLE
+            return 701; // DOUBLE PRECISION
+        case 7: // TIMESTAMP
+        case 12: // DATETIME
+            return 1114; // TIMESTAMP
+        case 10: // DATE
+        case 242: // NEWDATE
+            return 1082; // DATE
+        case 15: // VARCHAR
+        case 25: // VAR_STRING
+        case 250: // STRING
+        case 254: // ENUM
+        case 255: // SET
+            return 1043; // VARCHAR
+        case 16: // BIT
+        case 245: // TINY_BLOB
+        case 246: // MEDIUM_BLOB
+        case 247: // LONG_BLOB
+        case 248: // BLOB
+        case 251: // GEOMETRY
+            return 17; // BYTEA
+        default:
+            return 1043; // Default to VARCHAR if unknown
     }
 }

package/dist/index.js

@@ -41,7 +41,7 @@ class Quill {
         this.targetConnection = new CachedConnection_1.CachedConnection(databaseType, credentials, cache || {});
     }
     query({ orgId, metadata, }) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             this.targetConnection.orgId = orgId;
             let responseMetadata = {};
@@ -99,7 +99,7 @@ class Quill {
             catch (err) {
                 return {
                     status: "error",
-                    error: (_e = (_d = (_c = err.response) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.error) !== null && _e !== void 0 ? _e : err.message,
+                    error: err.message,
                     data: responseMetadata || {},
                 };
             }
@@ -216,8 +216,13 @@ class Quill {
     }
     postQuill(path, payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield axios_1.default.post(`${this.baseUrl}/sdk/${path}`, payload, this.config);
-            return response.data;
+            try {
+                const response = yield axios_1.default.post(`${this.baseUrl}/sdk/${path}`, payload, this.config);
+                return response.data;
+            }
+            catch (e) {
+                return new Promise((_, reject) => { var _a, _b; return reject({ message: ((_b = (_a = e === null || e === void 0 ? void 0 : e.response) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.error) || e.message || e }); });
+            }
         });
     }
     [Symbol.asyncDispose]() {
@@ -245,7 +250,6 @@ const requireQuill = ({ privateKey, databaseConnectionString, databaseConfig, ca
 module.exports = requireQuill;
 module.exports.default = requireQuill;
 module.exports.withConnection = DatabaseHelper_1.withConnection;
-module.exports.withPool = DatabaseHelper_1.withPool;
 module.exports.connectToDatabase = DatabaseHelper_1.connectToDatabase;
 module.exports.connectAndRunQuery = DatabaseHelper_1.connectAndRunQuery;
 module.exports.Quill = Quill;

package/examples/mysql-node/app.ts

@@ -2,7 +2,6 @@
 
 import express from "express";
 import cors from "cors";
-import requireQuill from "../../src/index";
 
 const app = express();
 const port = 3005;
@@ -41,7 +40,7 @@ app.get("/", (req, res) => {
   res.send("Hello World!");
 });
 
-const quill = requireQuill({
+const quill = require("../../src/index")({
   privateKey: process.env.MYSQL_PRIVATE_KEY ?? "",
   databaseConnectionString: process.env.MYSQL_DB_URL ?? "",
   databaseConfig: {}, // TODO: Add database config

package/package.json

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

package/src/db/DatabaseHelper.ts

@@ -119,23 +119,15 @@ export async function withConnection<T>(
   const connection = connectToDatabase(databaseType, config);
   try {
     return await callback(connection);
+  } catch (e: any) {
+    return new Promise((_, reject) =>
+      reject({ success: false, message: e.message || e.error || e }),
+    );
   } finally {
     await disconnectFromDatabase(databaseType, connection);
   }
 }
 
-export async function withPool<T>(
-  databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql",
-  pool: DatabaseConnection,
-  callback: (connection: DatabaseConnection) => T,
-): Promise<T> {
-  try {
-    return await callback(pool);
-  } finally {
-    await disconnectFromDatabase(databaseType, pool);
-  }
-}
-
 export function runQueryByDatabase(
   databaseType: "postgresql" | "snowflake" | "bigquery" | "mysql",
   connection: DatabaseConnection,

package/src/db/Mysql.ts

@@ -29,7 +29,7 @@ export function connectToMysql(config: MysqlConnectionConfig): MysqlPool {
   const pool = mysql.createPool({
     ...config,
     waitForConnections: true,
-    connectionLimit: 128,
+    connectionLimit: 24,
     queueLimit: 0,
   });
   return pool;
@@ -179,44 +179,84 @@ export async function getSchemaColumnInfoMysql(
 
 function mysqlTextDataTypeToPostgresOID(type: string): number {
   switch (type) {
-    case "bigint": // int
-      return 23;
-    case "tinyint": // int
-      return 23;
-    case "float": // float
-      return 700;
-    case "varchar": // varchar
-      return 1043;
-    case "timestamp": // date
-      return 1082;
-    case "date": // date
-      return 1082;
-    case "datetime": // date
-      return 1082;
-    default: // varchar
-      return 1043;
+    case "bigint": // BIGINT in MySQL
+      return 20; // BIGINT in PostgreSQL
+    case "tinyint": // TINYINT in MySQL
+      return 21; // SMALLINT in PostgreSQL
+    case "smallint": // SMALLINT in MySQL
+      return 21; // SMALLINT in PostgreSQL
+    case "int": // INT in MySQL
+      return 23; // INTEGER in PostgreSQL
+    case "float": // FLOAT in MySQL
+      return 701; // DOUBLE PRECISION in PostgreSQL
+    case "double": // DOUBLE in MySQL
+      return 701; // DOUBLE PRECISION in PostgreSQL
+    case "varchar": // VARCHAR in MySQL
+      return 1043; // VARCHAR in PostgreSQL
+    case "char": // CHAR in MySQL
+      return 1042; // CHAR in PostgreSQL
+    case "timestamp": // TIMESTAMP in MySQL
+      return 1114; // TIMESTAMP in PostgreSQL
+    case "date": // DATE in MySQL
+      return 1082; // DATE in PostgreSQL
+    case "datetime": // DATETIME in MySQL
+      return 1114; // TIMESTAMP in PostgreSQL
+    case "time": // TIME in MySQL
+      return 1083; // TIME in PostgreSQL
+    case "year": // YEAR in MySQL
+      return 23; // INTEGER in PostgreSQL
+    case "binary": // BINARY in MySQL
+      return 17; // BYTEA in PostgreSQL
+    case "blob": // BLOB in MySQL
+      return 17; // BYTEA in PostgreSQL
+    case "text": // TEXT in MySQL
+      return 25; // TEXT in PostgreSQL
+    case "json": // JSON in MySQL
+      return 114; // JSON in PostgreSQL
+    default:
+      return 1043; // VARCHAR in PostgreSQL (fallback)
   }
 }
 
 function mysqlDataTypeIdToPostgresType(type: number): number {
   switch (type) {
-    case 8: // int
-      return 23;
-    case 3: // int
-      return 23;
-    case 2: // int
-      return 23;
-    case 5: // float
-      return 700;
-    case 253: // varchar
-      return 1043;
-    case 7: // date
-      return 1082;
-    case 10: // date
-      return 1082;
-    case 12: // date
-      return 1082;
-    default: // varchar
-      return 1043;
+    case 0: // DECIMAL
+    case 1: // TINY
+    case 2: // SHORT
+    case 3: // LONG
+    case 8: // LONGLONG
+    case 9: // INT24
+    case 13: // YEAR
+      return 23; // INTEGER
+
+    case 4: // FLOAT
+    case 5: // DOUBLE
+      return 701; // DOUBLE PRECISION
+
+    case 7: // TIMESTAMP
+    case 12: // DATETIME
+      return 1114; // TIMESTAMP
+
+    case 10: // DATE
+    case 242: // NEWDATE
+      return 1082; // DATE
+
+    case 15: // VARCHAR
+    case 25: // VAR_STRING
+    case 250: // STRING
+    case 254: // ENUM
+    case 255: // SET
+      return 1043; // VARCHAR
+
+    case 16: // BIT
+    case 245: // TINY_BLOB
+    case 246: // MEDIUM_BLOB
+    case 247: // LONG_BLOB
+    case 248: // BLOB
+    case 251: // GEOMETRY
+      return 17; // BYTEA
+
+    default:
+      return 1043; // Default to VARCHAR if unknown
   }
 }

package/src/index.ts

@@ -19,7 +19,6 @@ import {
   getTablesBySchemaByDatabase,
   runQueryByDatabase,
   withConnection,
-  withPool,
 } from "./db/DatabaseHelper";
 import { convertTypeToPostgres } from "./utils/schemaConversion";
 
@@ -164,7 +163,7 @@ export class Quill implements AsyncDisposable {
     } catch (err) {
       return {
         status: "error",
-        error: (err as any).response?.data?.error ?? (err as any).message,
+        error: (err as any).message,
         data: responseMetadata || {},
       };
     }
@@ -317,12 +316,18 @@ export class Quill implements AsyncDisposable {
     path: string,
     payload: any,
   ): Promise<QuillClientResponse> {
-    const response = await axios.post(
-      `${this.baseUrl}/sdk/${path}`,
-      payload,
-      this.config,
-    );
-    return response.data;
+    try {
+      const response = await axios.post(
+        `${this.baseUrl}/sdk/${path}`,
+        payload,
+        this.config,
+      );
+      return response.data;
+    } catch (e: any) {
+      return new Promise((_, reject) =>
+        reject({ message: e?.response?.data?.error || e.message || e }),
+      );
+    }
   }
 
   public async [Symbol.asyncDispose](): Promise<void> {
@@ -362,7 +367,6 @@ const requireQuill = ({
 module.exports = requireQuill;
 module.exports.default = requireQuill;
 module.exports.withConnection = withConnection;
-module.exports.withPool = withPool;
 module.exports.connectToDatabase = connectToDatabase;
 module.exports.connectAndRunQuery = connectAndRunQuery;
 module.exports.Quill = Quill;