typesql-cli 0.4.8 → 0.4.9

package/mysql-query-analyzer/verify-multiple-result.js

@@ -1,48 +1,48 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyMultipleResult = void 0;
-const ts_mysql_parser_1 = require("ts-mysql-parser");
-const select_columns_1 = require("./select-columns");
-function verifyMultipleResult(exprContext, fromColumns) {
-    if (exprContext instanceof ts_mysql_parser_1.ExprIsContext) {
-        const boolPri = exprContext.boolPri();
-        if (boolPri instanceof ts_mysql_parser_1.PrimaryExprCompareContext) {
-            if (boolPri.compOp().EQUAL_OPERATOR()) {
-                let compareLeft = boolPri.boolPri();
-                let compareRight = boolPri.predicate();
-                if (isUniqueKeyComparation(compareLeft, fromColumns) || isUniqueKeyComparation(compareRight, fromColumns)) {
-                    return false; //multipleRow = false
-                }
-            }
-            return true; //multipleRow = true
-        }
-        return true; //multipleRow
-    }
-    if (exprContext instanceof ts_mysql_parser_1.ExprNotContext) {
-        return true;
-    }
-    if (exprContext instanceof ts_mysql_parser_1.ExprAndContext) {
-        const oneIsSingleResult = exprContext.expr().some(expr => verifyMultipleResult(expr, fromColumns) == false);
-        return oneIsSingleResult == false;
-    }
-    // if (exprContext instanceof ExprXorContext) {
-    //     const expressions = exprContext.expr();
-    // }
-    if (exprContext instanceof ts_mysql_parser_1.ExprOrContext) {
-        return true; //multipleRow = true
-    }
-    throw Error('Unknow type:' + exprContext.constructor.name);
-}
-exports.verifyMultipleResult = verifyMultipleResult;
-function isUniqueKeyComparation(compare, fromColumns) {
-    const tokens = select_columns_1.getSimpleExpressions(compare);
-    if (tokens.length == 1 && tokens[0] instanceof ts_mysql_parser_1.SimpleExprColumnRefContext) {
-        const fieldName = select_columns_1.splitName(tokens[0].text);
-        const col = select_columns_1.findColumn(fieldName, fromColumns);
-        if (col.columnKey == 'PRI' || col.columnKey == 'UNI') {
-            return true; //isUniqueKeyComparation = true
-        }
-    }
-    return false; //isUniqueKeyComparation = false
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyMultipleResult = void 0;
+const ts_mysql_parser_1 = require("ts-mysql-parser");
+const select_columns_1 = require("./select-columns");
+function verifyMultipleResult(exprContext, fromColumns) {
+    if (exprContext instanceof ts_mysql_parser_1.ExprIsContext) {
+        const boolPri = exprContext.boolPri();
+        if (boolPri instanceof ts_mysql_parser_1.PrimaryExprCompareContext) {
+            if (boolPri.compOp().EQUAL_OPERATOR()) {
+                let compareLeft = boolPri.boolPri();
+                let compareRight = boolPri.predicate();
+                if (isUniqueKeyComparation(compareLeft, fromColumns) || isUniqueKeyComparation(compareRight, fromColumns)) {
+                    return false; //multipleRow = false
+                }
+            }
+            return true; //multipleRow = true
+        }
+        return true; //multipleRow
+    }
+    if (exprContext instanceof ts_mysql_parser_1.ExprNotContext) {
+        return true;
+    }
+    if (exprContext instanceof ts_mysql_parser_1.ExprAndContext) {
+        const oneIsSingleResult = exprContext.expr().some(expr => verifyMultipleResult(expr, fromColumns) == false);
+        return oneIsSingleResult == false;
+    }
+    // if (exprContext instanceof ExprXorContext) {
+    //     const expressions = exprContext.expr();
+    // }
+    if (exprContext instanceof ts_mysql_parser_1.ExprOrContext) {
+        return true; //multipleRow = true
+    }
+    throw Error('Unknow type:' + exprContext.constructor.name);
+}
+exports.verifyMultipleResult = verifyMultipleResult;
+function isUniqueKeyComparation(compare, fromColumns) {
+    const tokens = (0, select_columns_1.getSimpleExpressions)(compare);
+    if (tokens.length == 1 && tokens[0] instanceof ts_mysql_parser_1.SimpleExprColumnRefContext) {
+        const fieldName = (0, select_columns_1.splitName)(tokens[0].text);
+        const col = (0, select_columns_1.findColumn)(fieldName, fromColumns);
+        if (col.columnKey == 'PRI' || col.columnKey == 'UNI') {
+            return true; //isUniqueKeyComparation = true
+        }
+    }
+    return false; //isUniqueKeyComparation = false
+}
 //# sourceMappingURL=verify-multiple-result.js.map

package/mysql-query-analyzer/verify-multiple-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"verify-multiple-result.js","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/verify-multiple-result.ts"],"names":[],"mappings":";;;AAAA,qDAGyB;AACzB,qDAA+E;AAG/E,SAAgB,oBAAoB,CAAC,WAAwB,EAAE,WAAwB;IACnF,IAAI,WAAW,YAAY,+BAAa,EAAE;QAEtC,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;QAEtC,IAAI,OAAO,YAAY,2CAAyB,EAAE;YAC9C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,EAAE;gBACnC,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpC,IAAI,YAAY,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;gBACvC,IAAI,sBAAsB,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI,sBAAsB,CAAC,YAAY,EAAE,WAAW,CAAC,EAAE;oBACvG,OAAO,KAAK,CAAC,CAAC,qBAAqB;iBACtC;aACJ;YACD,OAAO,IAAI,CAAC,CAAC,oBAAoB;SAEpC;QACD,OAAO,IAAI,CAAC,CAAC,aAAa;KAE7B;IACD,IAAI,WAAW,YAAY,gCAAc,EAAE;QACvC,OAAO,IAAI,CAAC;KACf;IACD,IAAI,WAAW,YAAY,gCAAc,EAAE;QACvC,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,KAAK,CAAC,CAAA;QAC3G,OAAO,iBAAiB,IAAI,KAAK,CAAC;KACrC;IACD,+CAA+C;IAC/C,8CAA8C;IAC9C,IAAI;IACJ,IAAI,WAAW,YAAY,+BAAa,EAAE;QACtC,OAAO,IAAI,CAAC,CAAC,oBAAoB;KACpC;IAED,MAAM,KAAK,CAAC,cAAc,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;AAC/D,CAAC;AAlCD,oDAkCC;AAED,SAAS,sBAAsB,CAAC,OAA0C,EAAE,WAAwB;IAChG,MAAM,MAAM,GAAG,qCAAoB,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,YAAY,4CAA0B,EAAE;QACvE,MAAM,SAAS,GAAG,0BAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,2BAAU,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC/C,IAAI,GAAG,CAAC,SAAS,IAAI,KAAK,IAAI,GAAG,CAAC,SAAS,IAAI,KAAK,EAAE;YAClD,OAAO,IAAI,CAAC,CAAC,+BAA+B;SAC/C;KACJ;IACD,OAAO,KAAK,CAAC,CAAC,gCAAgC;AAClD,CAAC"}
+{"version":3,"file":"verify-multiple-result.js","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/verify-multiple-result.ts"],"names":[],"mappings":";;;AAAA,qDAGyB;AACzB,qDAA+E;AAG/E,SAAgB,oBAAoB,CAAC,WAAwB,EAAE,WAAwB;IACnF,IAAI,WAAW,YAAY,+BAAa,EAAE;QAEtC,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;QAEtC,IAAI,OAAO,YAAY,2CAAyB,EAAE;YAC9C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,EAAE;gBACnC,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpC,IAAI,YAAY,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;gBACvC,IAAI,sBAAsB,CAAC,WAAW,EAAE,WAAW,CAAC,IAAI,sBAAsB,CAAC,YAAY,EAAE,WAAW,CAAC,EAAE;oBACvG,OAAO,KAAK,CAAC,CAAC,qBAAqB;iBACtC;aACJ;YACD,OAAO,IAAI,CAAC,CAAC,oBAAoB;SAEpC;QACD,OAAO,IAAI,CAAC,CAAC,aAAa;KAE7B;IACD,IAAI,WAAW,YAAY,gCAAc,EAAE;QACvC,OAAO,IAAI,CAAC;KACf;IACD,IAAI,WAAW,YAAY,gCAAc,EAAE;QACvC,MAAM,iBAAiB,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,KAAK,CAAC,CAAA;QAC3G,OAAO,iBAAiB,IAAI,KAAK,CAAC;KACrC;IACD,+CAA+C;IAC/C,8CAA8C;IAC9C,IAAI;IACJ,IAAI,WAAW,YAAY,+BAAa,EAAE;QACtC,OAAO,IAAI,CAAC,CAAC,oBAAoB;KACpC;IAED,MAAM,KAAK,CAAC,cAAc,GAAG,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;AAC/D,CAAC;AAlCD,oDAkCC;AAED,SAAS,sBAAsB,CAAC,OAA0C,EAAE,WAAwB;IAChG,MAAM,MAAM,GAAG,IAAA,qCAAoB,EAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,YAAY,4CAA0B,EAAE;QACvE,MAAM,SAAS,GAAG,IAAA,0BAAS,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,GAAG,GAAG,IAAA,2BAAU,EAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC/C,IAAI,GAAG,CAAC,SAAS,IAAI,KAAK,IAAI,GAAG,CAAC,SAAS,IAAI,KAAK,EAAE;YAClD,OAAO,IAAI,CAAC,CAAC,+BAA+B;SAC/C;KACJ;IACD,OAAO,KAAK,CAAC,CAAC,gCAAgC;AAClD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typesql-cli",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -21,14 +21,13 @@
   "devDependencies": {
     "@types/camelcase": "^5.2.0",
     "@types/mocha": "^7.0.2",
-    "@types/mysql2": "git+https://git@github.com/types/mysql2.git",
-    "@types/node": "^14.6.2",
+    "@types/node": "^20.4.0",
     "@types/yargs": "^15.0.5",
     "antlr4ts-cli": "^0.5.0-alpha.3",
     "mocha": "^8.1.3",
     "shx": "^0.3.3",
     "ts-node": "^8.10.2",
-    "typescript": "^3.9.7"
+    "typescript": "^5.1.6"
   },
   "dependencies": {
     "antlr4ts": "^0.5.0-alpha.3",
@@ -37,7 +36,7 @@
     "code-block-writer": "^10.1.0",
     "fp-ts": "^2.8.2",
     "moment": "^2.27.0",
-    "mysql2": "^2.1.0",
+    "mysql2": "^3.4.5",
     "ts-mysql-parser": "^0.2.0",
     "yargs": "^15.4.1"
   }

package/queryExectutor.d.ts

@@ -1,14 +1,16 @@
-import { Either } from "fp-ts/lib/Either";
-import { TypeSqlError } from "./types";
-import { ColumnSchema, ColumnSchema2 } from "./mysql-query-analyzer/types";
-export declare class DbClient {
-    private connection;
-    connect(connectionUri: string): Promise<Either<TypeSqlError, true>>;
-    closeConnection(): Promise<void>;
-    loadDbSchema(): Promise<Either<TypeSqlError, ColumnSchema[]>>;
-    loadTableSchema(tableName: string): Promise<Either<TypeSqlError, ColumnSchema2[]>>;
-    createParams(sql: string, paramValue: '1' | '?'): string[];
-    explainSql(sql: string): Promise<Either<TypeSqlError, boolean>>;
-    createInvalidSqlError(err: any): Either<TypeSqlError, never>;
-}
+import { Either } from "fp-ts/lib/Either";
+import { TypeSqlError } from "./types";
+import { ColumnSchema, ColumnSchema2 } from "./mysql-query-analyzer/types";
+export declare class DbClient {
+    private connection;
+    mySqlVersion: string;
+    connect(connectionUri: string): Promise<Either<TypeSqlError, true>>;
+    closeConnection(): Promise<void>;
+    loadDbSchema(): Promise<Either<TypeSqlError, ColumnSchema[]>>;
+    loadTableSchema(tableName: string): Promise<Either<TypeSqlError, ColumnSchema2[]>>;
+    createParams(sql: string, paramValue: '1' | '?'): string[];
+    explainSql(sql: string): Promise<Either<TypeSqlError, boolean>>;
+    createInvalidSqlError(err: any): Either<TypeSqlError, never>;
+    isVersion8(): boolean;
+}
 //# sourceMappingURL=queryExectutor.d.ts.map

package/queryExectutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryExectutor.d.ts","sourceRoot":"","sources":["../../src/queryExectutor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAe,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAO3E,qBAAa,QAAQ;IAEjB,OAAO,CAAC,UAAU,CAAoB;IAChC,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAcnE,eAAe;IAMf,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC;IAkB7D,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;IA0BxF,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,GAAG;IAQzC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAYrE,qBAAqB,CAAC,GAAG,EAAE,GAAG;CAOjC"}
+{"version":3,"file":"queryExectutor.d.ts","sourceRoot":"","sources":["../../src/queryExectutor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAe,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAO3E,qBAAa,QAAQ;IAEjB,OAAO,CAAC,UAAU,CAAoB;IACtC,YAAY,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;IAgBnE,eAAe;IAMf,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,YAAY,EAAE,CAAC,CAAC;IAoB7D,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;IA0BxF,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,GAAG;IAQzC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAYrE,qBAAqB,CAAC,GAAG,EAAE,GAAG;IAQ9B,UAAU;CAGb"}

package/queryExectutor.js

@@ -1,67 +1,67 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DbClient = void 0;
-const promise_1 = __importDefault(require("mysql2/promise"));
-const Either_1 = require("fp-ts/lib/Either");
-const connectionNotOpenError = {
-    name: 'Connection error',
-    description: 'The database connection is not open.'
-};
-class DbClient {
-    connect(connectionUri) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this.connection = yield promise_1.default.createConnection(connectionUri);
-                return Either_1.right(true);
-            }
-            catch (e) {
-                const connError = {
-                    name: 'Connection error',
-                    description: e.message
-                };
-                return Either_1.left(connError);
-            }
-        });
-    }
-    closeConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.connection != null) {
-                this.connection.end();
-            }
-        });
-    }
-    loadDbSchema() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sql = `
-        SELECT TABLE_SCHEMA as "schema", TABLE_NAME as "table", COLUMN_NAME as "column", DATA_TYPE as "column_type", if(IS_NULLABLE='NO', true, false) as "notNull",
-            COLUMN_KEY as "columnKey"
-        FROM INFORMATION_SCHEMA.COLUMNS 
-        ORDER BY TABLE_NAME, ORDINAL_POSITION
-        `;
-            if (this.connection != null) {
-                return this.connection.execute(sql)
-                    .then(res => {
-                    const columns = res[0];
-                    return Either_1.right(columns.map(col => (Object.assign(Object.assign({}, col), { notNull: !!+col.notNull })))); //convert 1 to true, 0 to false
-                });
-            }
-            return Either_1.left(connectionNotOpenError);
-        });
-    }
-    loadTableSchema(tableName) {
-        return __awaiter(this, void 0, void 0, function* () {
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DbClient = void 0;
+const promise_1 = require("mysql2/promise");
+const Either_1 = require("fp-ts/lib/Either");
+const connectionNotOpenError = {
+    name: 'Connection error',
+    description: 'The database connection is not open.'
+};
+class DbClient {
+    connect(connectionUri) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.connection = yield (0, promise_1.createConnection)(connectionUri);
+                const [rows] = yield this.connection.execute("select @@version as version");
+                this.mySqlVersion = rows[0].version;
+                return (0, Either_1.right)(true);
+            }
+            catch (e) {
+                const connError = {
+                    name: 'Connection error',
+                    description: e.message
+                };
+                return (0, Either_1.left)(connError);
+            }
+        });
+    }
+    closeConnection() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.connection != null) {
+                this.connection.end();
+            }
+        });
+    }
+    loadDbSchema() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.connection != null) {
+                const sql = `
+                SELECT TABLE_SCHEMA as "schema", TABLE_NAME as "table", COLUMN_NAME as "column", DATA_TYPE as "column_type", if(IS_NULLABLE='NO', true, false) as "notNull",
+                    COLUMN_KEY as "columnKey"
+                FROM INFORMATION_SCHEMA.COLUMNS 
+                WHERE TABLE_SCHEMA = "${this.connection.config.database}"
+                ORDER BY TABLE_NAME, ORDINAL_POSITION
+            `;
+                return this.connection.execute(sql)
+                    .then(res => {
+                    const columns = res[0];
+                    return (0, Either_1.right)(columns.map(col => (Object.assign(Object.assign({}, col), { notNull: !!+col.notNull })))); //convert 1 to true, 0 to false
+                });
+            }
+            return (0, Either_1.left)(connectionNotOpenError);
+        });
+    }
+    loadTableSchema(tableName) {
+        return __awaiter(this, void 0, void 0, function* () {
             const sql = `
         SELECT 
             TABLE_SCHEMA as "schema", 
@@ -74,44 +74,47 @@ class DbClient {
         FROM INFORMATION_SCHEMA.COLUMNS 
         WHERE TABLE_NAME = ?
         ORDER BY TABLE_NAME, ORDINAL_POSITION
-        `;
-            if (this.connection) {
-                return this.connection.execute(sql, [tableName])
-                    .then(res => {
-                    const columns = res[0];
-                    return Either_1.right(columns);
-                });
-            }
-            return Either_1.left(connectionNotOpenError);
-        });
-    }
-    createParams(sql, paramValue) {
-        let params = [];
-        for (var i = 0; i < sql.length; i++) {
-            if (sql[i] === "?")
-                params.push(paramValue);
-        }
-        return params;
-    }
-    explainSql(sql) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.connection) {
-                //@ts-ignore
-                return this.connection.prepare(sql)
-                    .then(() => {
-                    return Either_1.right(true);
-                }).catch((err) => this.createInvalidSqlError(err));
-            }
-            return Either_1.left(connectionNotOpenError);
-        });
-    }
-    createInvalidSqlError(err) {
-        const error = {
-            name: 'Invalid sql',
-            description: err.message
-        };
-        return Either_1.left(error);
-    }
-}
-exports.DbClient = DbClient;
+        `;
+            if (this.connection) {
+                return this.connection.execute(sql, [tableName])
+                    .then(res => {
+                    const columns = res[0];
+                    return (0, Either_1.right)(columns);
+                });
+            }
+            return (0, Either_1.left)(connectionNotOpenError);
+        });
+    }
+    createParams(sql, paramValue) {
+        let params = [];
+        for (var i = 0; i < sql.length; i++) {
+            if (sql[i] === "?")
+                params.push(paramValue);
+        }
+        return params;
+    }
+    explainSql(sql) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.connection) {
+                //@ts-ignore
+                return this.connection.prepare(sql)
+                    .then(() => {
+                    return (0, Either_1.right)(true);
+                }).catch((err) => this.createInvalidSqlError(err));
+            }
+            return (0, Either_1.left)(connectionNotOpenError);
+        });
+    }
+    createInvalidSqlError(err) {
+        const error = {
+            name: 'Invalid sql',
+            description: err.message
+        };
+        return (0, Either_1.left)(error);
+    }
+    isVersion8() {
+        return this.mySqlVersion.startsWith("8.");
+    }
+}
+exports.DbClient = DbClient;
 //# sourceMappingURL=queryExectutor.js.map

package/queryExectutor.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryExectutor.js","sourceRoot":"","sources":["../../src/queryExectutor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queryExectutor.js","sourceRoot":"","sources":["../../src/queryExectutor.ts"],"names":[],"mappings":"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"}

package/sql-generator.d.ts

@@ -1,6 +1,6 @@
-import { ColumnSchema2 } from "./mysql-query-analyzer/types";
-export declare function generateSelectStatment(tableName: string, columns: ColumnSchema2[]): string;
-export declare function generateInsertStatment(tableName: string, dbSchema: ColumnSchema2[]): string;
-export declare function generateUpdateStatment(tableName: string, dbSchema: ColumnSchema2[]): string;
-export declare function generateDeleteStatment(tableName: string, dbSchema: ColumnSchema2[]): string;
+import { ColumnSchema2 } from "./mysql-query-analyzer/types";
+export declare function generateSelectStatment(tableName: string, columns: ColumnSchema2[]): string;
+export declare function generateInsertStatment(tableName: string, dbSchema: ColumnSchema2[]): string;
+export declare function generateUpdateStatment(tableName: string, dbSchema: ColumnSchema2[]): string;
+export declare function generateDeleteStatment(tableName: string, dbSchema: ColumnSchema2[]): string;
 //# sourceMappingURL=sql-generator.d.ts.map

package/sql-generator.js

@@ -1,89 +1,89 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDeleteStatment = exports.generateUpdateStatment = exports.generateInsertStatment = exports.generateSelectStatment = void 0;
-const code_block_writer_1 = __importDefault(require("code-block-writer"));
-function generateSelectStatment(tableName, columns) {
-    const keys = columns.filter(col => col.columnKey = 'PRI');
-    if (keys.length == 0) {
-        keys.push(...columns.filter(col => col.columnKey == 'UNI'));
-    }
-    const writer = new code_block_writer_1.default();
-    writer.writeLine("SELECT");
-    columns.forEach((col, columnIndex) => {
-        writer.indent().write(col.column);
-        writer.conditionalWrite(columnIndex < columns.length - 1, ',');
-        writer.newLine();
-    });
-    writer.write(`FROM ${escapeTableName(tableName)}`);
-    return writer.toString();
-}
-exports.generateSelectStatment = generateSelectStatment;
-function generateInsertStatment(tableName, dbSchema) {
-    const columns = dbSchema.filter(col => !col.autoincrement);
-    const writer = new code_block_writer_1.default();
-    writer.writeLine(`INSERT INTO ${escapeTableName(tableName)}`);
-    writer.writeLine("(");
-    columns.forEach((col, columnIndex) => {
-        writer.indent().write(col.column);
-        writer.conditionalWrite(columnIndex != columns.length - 1, ',');
-        writer.newLine();
-    });
-    writer.writeLine(')');
-    writer.writeLine("VALUES");
-    writer.writeLine("(");
-    columns.forEach((col, columnIndex) => {
-        writer.indent().write(':' + col.column);
-        writer.conditionalWrite(columnIndex < columns.length - 1, ',');
-        writer.newLine();
-    });
-    writer.write(")");
-    return writer.toString();
-}
-exports.generateInsertStatment = generateInsertStatment;
-function generateUpdateStatment(tableName, dbSchema) {
-    const columns = dbSchema.filter(col => !col.autoincrement);
-    const keys = dbSchema.filter(col => col.columnKey = 'PRI');
-    if (keys.length == 0) {
-        keys.push(...dbSchema.filter(col => col.columnKey == 'UNI'));
-    }
-    const writer = new code_block_writer_1.default();
-    writer.writeLine(`UPDATE ${escapeTableName(tableName)}`);
-    writer.writeLine("SET");
-    columns.forEach((col, columnIndex) => {
-        writer.indent().write(`${col.column} = :${col.column}`);
-        writer.conditionalWrite(columnIndex != columns.length - 1, ',');
-        writer.newLine();
-    });
-    writer.writeLine('WHERE');
-    if (keys.length > 0) {
-        writer.indent().write(`${keys[0].column} = :${keys[0].column}`);
-    }
-    return writer.toString();
-}
-exports.generateUpdateStatment = generateUpdateStatment;
-function generateDeleteStatment(tableName, dbSchema) {
-    const keys = dbSchema.filter(col => col.columnKey = 'PRI');
-    if (keys.length == 0) {
-        keys.push(...dbSchema.filter(col => col.columnKey == 'UNI'));
-    }
-    const writer = new code_block_writer_1.default();
-    writer.writeLine(`DELETE FROM ${escapeTableName(tableName)}`);
-    writer.write('WHERE ');
-    if (keys.length > 0) {
-        writer.write(`${keys[0].column} = :${keys[0].column}`);
-    }
-    return writer.toString();
-}
-exports.generateDeleteStatment = generateDeleteStatment;
-//Permitted characters in unquoted identifiers: ASCII: [0-9,a-z,A-Z$_]
-function escapeTableName(tableName) {
-    const validPattern = /^[a-zA-Z0-9_$]+$/g;
-    if (!validPattern.test(tableName)) {
-        return `\`${tableName}\``;
-    }
-    return tableName;
-}
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateDeleteStatment = exports.generateUpdateStatment = exports.generateInsertStatment = exports.generateSelectStatment = void 0;
+const code_block_writer_1 = __importDefault(require("code-block-writer"));
+function generateSelectStatment(tableName, columns) {
+    const keys = columns.filter(col => col.columnKey = 'PRI');
+    if (keys.length == 0) {
+        keys.push(...columns.filter(col => col.columnKey == 'UNI'));
+    }
+    const writer = new code_block_writer_1.default();
+    writer.writeLine("SELECT");
+    columns.forEach((col, columnIndex) => {
+        writer.indent().write(col.column);
+        writer.conditionalWrite(columnIndex < columns.length - 1, ',');
+        writer.newLine();
+    });
+    writer.write(`FROM ${escapeTableName(tableName)}`);
+    return writer.toString();
+}
+exports.generateSelectStatment = generateSelectStatment;
+function generateInsertStatment(tableName, dbSchema) {
+    const columns = dbSchema.filter(col => !col.autoincrement);
+    const writer = new code_block_writer_1.default();
+    writer.writeLine(`INSERT INTO ${escapeTableName(tableName)}`);
+    writer.writeLine("(");
+    columns.forEach((col, columnIndex) => {
+        writer.indent().write(col.column);
+        writer.conditionalWrite(columnIndex != columns.length - 1, ',');
+        writer.newLine();
+    });
+    writer.writeLine(')');
+    writer.writeLine("VALUES");
+    writer.writeLine("(");
+    columns.forEach((col, columnIndex) => {
+        writer.indent().write(':' + col.column);
+        writer.conditionalWrite(columnIndex < columns.length - 1, ',');
+        writer.newLine();
+    });
+    writer.write(")");
+    return writer.toString();
+}
+exports.generateInsertStatment = generateInsertStatment;
+function generateUpdateStatment(tableName, dbSchema) {
+    const columns = dbSchema.filter(col => !col.autoincrement);
+    const keys = dbSchema.filter(col => col.columnKey = 'PRI');
+    if (keys.length == 0) {
+        keys.push(...dbSchema.filter(col => col.columnKey == 'UNI'));
+    }
+    const writer = new code_block_writer_1.default();
+    writer.writeLine(`UPDATE ${escapeTableName(tableName)}`);
+    writer.writeLine("SET");
+    columns.forEach((col, columnIndex) => {
+        writer.indent().write(`${col.column} = :${col.column}`);
+        writer.conditionalWrite(columnIndex != columns.length - 1, ',');
+        writer.newLine();
+    });
+    writer.writeLine('WHERE');
+    if (keys.length > 0) {
+        writer.indent().write(`${keys[0].column} = :${keys[0].column}`);
+    }
+    return writer.toString();
+}
+exports.generateUpdateStatment = generateUpdateStatment;
+function generateDeleteStatment(tableName, dbSchema) {
+    const keys = dbSchema.filter(col => col.columnKey = 'PRI');
+    if (keys.length == 0) {
+        keys.push(...dbSchema.filter(col => col.columnKey == 'UNI'));
+    }
+    const writer = new code_block_writer_1.default();
+    writer.writeLine(`DELETE FROM ${escapeTableName(tableName)}`);
+    writer.write('WHERE ');
+    if (keys.length > 0) {
+        writer.write(`${keys[0].column} = :${keys[0].column}`);
+    }
+    return writer.toString();
+}
+exports.generateDeleteStatment = generateDeleteStatment;
+//Permitted characters in unquoted identifiers: ASCII: [0-9,a-z,A-Z$_]
+function escapeTableName(tableName) {
+    const validPattern = /^[a-zA-Z0-9_$]+$/g;
+    if (!validPattern.test(tableName)) {
+        return `\`${tableName}\``;
+    }
+    return tableName;
+}
 //# sourceMappingURL=sql-generator.js.map