typesql-cli 0.9.6 → 0.10.1

package/mysql-query-analyzer/traverse.js

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderByColumns = exports.verifyMultipleResult2 = exports.isMultipleRowResult = exports.selectAllColumns = exports.filterColumns = exports.traverseWithClause = exports.traverseQuerySpecification = exports.getUpdateColumns = exports.traverseDeleteStatement = exports.traverseInsertStatement = exports.traverseQueryContext = void 0;
+exports.traverseQueryContext = traverseQueryContext;
+exports.traverseInsertStatement = traverseInsertStatement;
+exports.traverseDeleteStatement = traverseDeleteStatement;
+exports.getUpdateColumns = getUpdateColumns;
+exports.traverseQuerySpecification = traverseQuerySpecification;
+exports.traverseWithClause = traverseWithClause;
+exports.filterColumns = filterColumns;
+exports.selectAllColumns = selectAllColumns;
+exports.isMultipleRowResult = isMultipleRowResult;
+exports.verifyMultipleResult2 = verifyMultipleResult2;
+exports.getOrderByColumns = getOrderByColumns;
 const ts_mysql_parser_1 = require("@wsporto/ts-mysql-parser");
 const describe_query_1 = require("../describe-query");
 const parse_1 = require("./parse");
@@ -55,9 +65,8 @@ function traverseQueryContext(queryContext, dbSchema, namedParameters) {
         const typeInfer = traverseDeleteStatement(deleteStatement, traverseContext);
         return typeInfer;
     }
-    throw Error('traverseSql - not supported: ' + queryContext.constructor.name);
+    throw Error(`traverseSql - not supported: ${queryContext.constructor.name}`);
 }
-exports.traverseQueryContext = traverseQueryContext;
 function traverseSelectStatement(selectStatement, traverseContext, namedParameters) {
     const queryExpression = selectStatement.queryExpression();
     if (queryExpression) {
@@ -65,14 +74,14 @@ function traverseSelectStatement(selectStatement, traverseContext, namedParamete
         const orderByParameters = (0, parse_1.extractOrderByParameters)(selectStatement);
         const limitParameters = (0, parse_1.extractLimitParameters)(selectStatement);
         const paramInference = (0, infer_param_nullability_1.inferParamNullabilityQueryExpression)(queryExpression);
-        const allParameters = traverseContext.parameters
-            .map((param, index) => {
+        const allParameters = traverseContext.parameters.map((param, index) => {
             const param2 = Object.assign(Object.assign({}, param), { notNull: paramInference[index] });
             return param2;
         });
         const paramIndexes = (0, util_1.getParameterIndexes)(namedParameters.slice(0, allParameters.length)); //for [a, a, b, a] will return a: [0, 1, 3]; b: [2]
-        paramIndexes.forEach(paramIndex => {
+        paramIndexes.forEach((paramIndex) => {
             (0, util_1.getPairWise)(paramIndex.indexes, (cur, next) => {
+                //for [0, 1, 3] will return [0, 1], [1, 3]
                 traverseContext.constraints.push({
                     expression: paramIndex.paramName,
                     type1: allParameters[cur].type,
@@ -96,7 +105,7 @@ function traverseSelectStatement(selectStatement, traverseContext, namedParamete
         }
         return traverseResult;
     }
-    throw Error('traverseSelectStatement - not supported: ' + selectStatement.getText());
+    throw Error(`traverseSelectStatement - not supported: ${selectStatement.getText()}`);
 }
 function traverseInsertStatement(insertStatement, traverseContext) {
     var _a, _b;
@@ -105,12 +114,15 @@ function traverseInsertStatement(insertStatement, traverseContext) {
     let exprOrDefaultList = [];
     const valuesContext = (_a = insertStatement.insertFromConstructor()) === null || _a === void 0 ? void 0 : _a.insertValues().valueList().values_list();
     if (valuesContext) {
-        exprOrDefaultList = valuesContext.map(valueContext => { var _a; return ((_a = valueContext.children) === null || _a === void 0 ? void 0 : _a.filter(valueContext => valueContext instanceof ts_mysql_parser_1.ExprIsContext || valueContext.getText() == 'DEFAULT')) || []; });
+        exprOrDefaultList = valuesContext.map((valueContext) => {
+            var _a;
+            return ((_a = valueContext.children) === null || _a === void 0 ? void 0 : _a.filter((valueContext) => valueContext instanceof ts_mysql_parser_1.ExprIsContext || valueContext.getText() === 'DEFAULT')) || [];
+        });
     }
     const insertIntoTable = (0, collect_constraints_1.getInsertIntoTable)(insertStatement);
     const fromColumns = traverseContext.dbSchema
-        .filter(c => c.table == insertIntoTable)
-        .map(c => {
+        .filter((c) => c.table === insertIntoTable)
+        .map((c) => {
         const col = {
             table: c.table,
             columnName: c.column,
@@ -122,20 +134,20 @@ function traverseInsertStatement(insertStatement, traverseContext) {
     });
     const insertColumns = (0, collect_constraints_1.getInsertColumns)(insertStatement, fromColumns);
     traverseContext.fromColumns = insertColumns;
-    exprOrDefaultList.forEach(exprOrDefault => {
+    exprOrDefaultList.forEach((exprOrDefault) => {
         exprOrDefault.forEach((expr, index) => {
             const column = insertColumns[index];
             if (expr instanceof ts_mysql_parser_1.ExprContext) {
                 const numberParamsBefore = traverseContext.parameters.length;
                 const exprType = traverseExpr(expr, traverseContext);
                 const paramNullabilityExpr = (0, infer_param_nullability_1.inferParamNullability)(expr);
-                traverseContext.parameters.slice(numberParamsBefore).forEach(param => {
-                    paramsNullability[param.type.id] = paramNullabilityExpr.every(n => n) && column.notNull;
+                traverseContext.parameters.slice(numberParamsBefore).forEach((param) => {
+                    paramsNullability[param.type.id] = paramNullabilityExpr.every((n) => n) && column.notNull;
                 });
                 traverseContext.constraints.push({
                     expression: expr.getText(),
                     //TODO - CHANGING ORDER SHOULDN'T AFFECT THE TYPE INFERENCE
-                    type1: exprType.kind == 'TypeOperator' ? exprType.types[0] : exprType,
+                    type1: exprType.kind === 'TypeOperator' ? exprType.types[0] : exprType,
                     type2: (0, collect_constraints_1.freshVar)(column.columnName, column.columnType.type)
                 });
             }
@@ -144,7 +156,7 @@ function traverseInsertStatement(insertStatement, traverseContext) {
         });
     });
     const updateList = ((_b = insertStatement.insertUpdateList()) === null || _b === void 0 ? void 0 : _b.updateList().updateElement_list()) || [];
-    updateList.forEach(updateElement => {
+    updateList.forEach((updateElement) => {
         const columnName = updateElement.columnRef().getText();
         const field = (0, select_columns_1.splitName)(columnName);
         const expr = updateElement.expr();
@@ -152,7 +164,7 @@ function traverseInsertStatement(insertStatement, traverseContext) {
             const numberParamsBefore = traverseContext.parameters.length;
             const exprType = traverseExpr(expr, traverseContext);
             const column = (0, select_columns_1.findColumn)(field, fromColumns);
-            traverseContext.parameters.slice(numberParamsBefore).forEach(param => {
+            traverseContext.parameters.slice(numberParamsBefore).forEach((param) => {
                 paramsNullability[param.type.id] = column.notNull;
             });
             traverseContext.constraints.push({
@@ -169,7 +181,7 @@ function traverseInsertStatement(insertStatement, traverseContext) {
         const exprTypes = traverseInsertQueryExpression(insertQueryExpression, traverseContext);
         exprTypes.columns.forEach((type, index) => {
             const column = insertColumns[index];
-            if (type.type.kind == 'TypeVar') {
+            if (type.type.kind === 'TypeVar') {
                 paramsNullability[type.type.id] = column.notNull;
             }
             traverseContext.constraints.push({
@@ -189,7 +201,7 @@ function traverseInsertStatement(insertStatement, traverseContext) {
     typeInfo.forEach((param, index) => {
         const paramId = traverseContext.parameters[index].type.id;
         allParameters.push({
-            name: 'param' + (allParameters.length + 1),
+            name: `param${allParameters.length + 1}`,
             columnType: (0, describe_query_1.verifyNotInferred)(param),
             notNull: paramsNullability[paramId]
         });
@@ -201,7 +213,6 @@ function traverseInsertStatement(insertStatement, traverseContext) {
     };
     return typeInferenceResult;
 }
-exports.traverseInsertStatement = traverseInsertStatement;
 function traverseUpdateStatement(updateStatement, traverseContext, namedParamters) {
     var _a;
     const updateElement = updateStatement.updateList().updateElement_list();
@@ -217,7 +228,7 @@ function traverseUpdateStatement(updateStatement, traverseContext, namedParamter
     const paramsBefore = traverseContext.parameters.length;
     const whereExpr = (_a = updateStatement.whereClause()) === null || _a === void 0 ? void 0 : _a.expr();
     const paramNullability = (0, infer_param_nullability_1.inferParamNullability)(updateStatement);
-    updateElement.forEach(updateElement => {
+    updateElement.forEach((updateElement) => {
         const expr = updateElement.expr();
         if (expr) {
             const paramBeforeExpr = traverseContext.parameters.length;
@@ -246,7 +257,7 @@ function traverseUpdateStatement(updateStatement, traverseContext, namedParamter
     }
     traverseContext.parameters.slice(0, paramsBefore).forEach((param, index) => {
         whereParameters.push({
-            name: namedParamters[index] || 'param' + (whereParameters.length + 1),
+            name: namedParamters[index] || `param${whereParameters.length + 1}`,
             type: param.type,
             notNull: paramNullability[index],
             table: ''
@@ -254,7 +265,7 @@ function traverseUpdateStatement(updateStatement, traverseContext, namedParamter
     });
     traverseContext.parameters.slice(paramsAfter).forEach((param, index) => {
         whereParameters.push({
-            name: namedParamters[paramsAfter + index] || 'param' + (whereParameters.length + 1),
+            name: namedParamters[paramsAfter + index] || `param${whereParameters.length + 1}`,
             type: param.type,
             notNull: paramNullability[paramsAfter + index],
             table: ''
@@ -280,7 +291,7 @@ function traverseDeleteStatement(deleteStatement, traverseContext) {
         const paramNullability = (0, infer_param_nullability_1.inferParamNullability)(whereExpr);
         typeInfo.forEach((param, paramIndex) => {
             allParameters.push({
-                name: 'param' + (allParameters.length + 1),
+                name: `param${allParameters.length + 1}`,
                 columnType: (0, describe_query_1.verifyNotInferred)(param),
                 notNull: paramNullability[paramIndex]
             });
@@ -293,13 +304,11 @@ function traverseDeleteStatement(deleteStatement, traverseContext) {
     };
     return typeInferenceResult;
 }
-exports.traverseDeleteStatement = traverseDeleteStatement;
 function getUpdateColumns(updateStatement, traverseContext) {
     const tableReferences = updateStatement.tableReferenceList().tableReference_list();
     const columns = traverseTableReferenceList(tableReferences, traverseContext, null);
     return columns;
 }
-exports.getUpdateColumns = getUpdateColumns;
 function traverseInsertQueryExpression(insertQueryExpression, traverseContext) {
     const queryExpressionOrParens = insertQueryExpression.queryExpressionOrParens();
     return traverseQueryExpressionOrParens(queryExpressionOrParens, traverseContext);
@@ -313,7 +322,7 @@ function traverseQueryExpressionOrParens(queryExpressionOrParens, traverseContex
     if (queryEpressionParens) {
         return traverseQueryExpressionParens(queryEpressionParens, traverseContext);
     }
-    throw Error("walkQueryExpressionOrParens");
+    throw Error('walkQueryExpressionOrParens');
 }
 function traverseQueryExpression(queryExpression, traverseContext, cte, recursiveNames) {
     const withClause = queryExpression.withClause();
@@ -332,7 +341,10 @@ function traverseQueryExpression(queryExpression, traverseContext, cte, recursiv
     const orderByClause = queryExpression.orderClause();
     if (orderByClause) {
         if (orderByClause.getText().toLowerCase() !== 'orderby?') {
-            orderByClause.orderList().orderExpression_list().forEach(orderByExpr => {
+            orderByClause
+                .orderList()
+                .orderExpression_list()
+                .forEach((orderByExpr) => {
                 traverseExpr(orderByExpr.expr(), Object.assign(Object.assign({}, traverseContext), { fromColumns: exprResult.fromColumns || [] }));
             });
         }
@@ -348,7 +360,7 @@ function traverseQueryExpressionParens(queryExpressionParens, traverseContext, c
     if (queryExpressionParens2) {
         return traverseQueryExpressionParens(queryExpressionParens, traverseContext, cte, recursiveNames);
     }
-    throw Error("walkQueryExpressionParens");
+    throw Error('walkQueryExpressionParens');
 }
 function createUnionVar(type, name) {
     const newVar = Object.assign(Object.assign({}, type), { name: name, table: '' });
@@ -358,21 +370,23 @@ function traverseQueryExpressionBody(queryExpressionBody, traverseContext, cte,
     const allQueries = (0, parse_1.getAllQuerySpecificationsFromSelectStatement)(queryExpressionBody);
     const [first, ...unionQuerySpec] = allQueries;
     const mainQueryResult = traverseQuerySpecification(first, traverseContext);
-    const resultTypes = mainQueryResult.columns.map((t, index) => unionQuerySpec.length == 0 ? t.type : createUnionVar(t.type, recursiveNames && recursiveNames.length > 0 ? recursiveNames[index] : t.name)); //TODO mover para traversequeryspecificat?
+    const resultTypes = mainQueryResult.columns.map((t, index) => unionQuerySpec.length === 0
+        ? t.type
+        : createUnionVar(t.type, recursiveNames && recursiveNames.length > 0 ? recursiveNames[index] : t.name)); //TODO mover para traversequeryspecificat?
     if (cte) {
         resultTypes.forEach((col, index) => {
             const withCol = {
                 table: cte,
                 columnName: col.name,
                 columnType: col,
-                columnKey: "",
+                columnKey: '',
                 notNull: mainQueryResult.columns[index].notNull
             };
             traverseContext.withSchema.push(withCol);
         });
     }
     for (let queryIndex = 0; queryIndex < unionQuerySpec.length; queryIndex++) {
-        const columnNames = recursiveNames && recursiveNames.length > 0 ? recursiveNames : mainQueryResult.columns.map(col => col.name);
+        const columnNames = recursiveNames && recursiveNames.length > 0 ? recursiveNames : mainQueryResult.columns.map((col) => col.name);
         const newFromColumns = recursiveNames ? renameFromColumns(mainQueryResult.columns, columnNames) : [];
         const unionQuery = unionQuerySpec[queryIndex];
         const unionResult = traverseQuerySpecification(unionQuery, Object.assign(Object.assign({}, traverseContext), { fromColumns: newFromColumns }));
@@ -405,10 +419,10 @@ function traverseQueryExpressionBody(queryExpressionBody, traverseContext, cte,
 function renameFromColumns(fromColumns, recursiveNames) {
     const newFromColumns = fromColumns.map((col, index) => {
         const newCol = {
-            table: "",
+            table: '',
             columnName: recursiveNames[index],
             columnType: col.type,
-            columnKey: "",
+            columnKey: '',
             notNull: col.notNull
         };
         return newCol;
@@ -438,12 +452,12 @@ function traverseQuerySpecification(querySpec, traverseContext) {
     });
     const havingClause = querySpec.havingClause();
     if (havingClause) {
-        const selectColumns = columns.map(c => {
+        const selectColumns = columns.map((c) => {
             const col = {
-                table: "",
+                table: '',
                 columnName: c.name,
                 columnType: c.type,
-                columnKey: "",
+                columnKey: '',
                 notNull: c.notNull
             };
             return col;
@@ -455,17 +469,19 @@ function traverseQuerySpecification(querySpec, traverseContext) {
         fromColumns: fromColumnsFrom
     };
 }
-exports.traverseQuerySpecification = traverseQuerySpecification;
 function traverseWithClause(withClause, traverseContext) {
     //result1, result2
-    withClause.commonTableExpression_list().forEach(commonTableExpression => {
+    withClause.commonTableExpression_list().forEach((commonTableExpression) => {
         var _a, _b;
         const cte = commonTableExpression.identifier().getText();
-        const recursiveNames = withClause.RECURSIVE_SYMBOL() ? ((_a = commonTableExpression.columnInternalRefList()) === null || _a === void 0 ? void 0 : _a.columnInternalRef_list().map(t => t.getText())) || [] : undefined;
+        const recursiveNames = withClause.RECURSIVE_SYMBOL()
+            ? ((_a = commonTableExpression
+                .columnInternalRefList()) === null || _a === void 0 ? void 0 : _a.columnInternalRef_list().map((t) => t.getText())) || []
+            : undefined;
         const subQuery = commonTableExpression.subquery();
         traverseSubquery(subQuery, traverseContext, cte, recursiveNames); //recursive= true??
         (_b = traverseContext.dynamicSqlInfo.with) === null || _b === void 0 ? void 0 : _b.push({
-            fragment: (0, select_columns_1.extractOriginalSql)(commonTableExpression) + '',
+            fragment: `${(0, select_columns_1.extractOriginalSql)(commonTableExpression)}`,
             relation: cte,
             fields: [],
             dependOnFields: [],
@@ -475,7 +491,6 @@ function traverseWithClause(withClause, traverseContext) {
         });
     });
 }
-exports.traverseWithClause = traverseWithClause;
 function traverseFromClause(fromClause, traverseContext) {
     var _a;
     const tableReferenceList = (_a = fromClause.tableReferenceList()) === null || _a === void 0 ? void 0 : _a.tableReference_list();
@@ -485,15 +500,15 @@ function traverseFromClause(fromClause, traverseContext) {
 function traverseTableReferenceList(tableReferenceList, traverseContext, currentFragment) {
     const result = [];
     const fragements = [];
-    tableReferenceList.forEach(tab => {
+    tableReferenceList.forEach((tab) => {
         const tableFactor = tab.tableFactor();
         if (tableFactor) {
-            let paramBefore = traverseContext.parameters.length;
+            const paramBefore = traverseContext.parameters.length;
             const fields = traverseTableFactor(tableFactor, traverseContext, currentFragment);
-            let paramsAfter = traverseContext.parameters.length;
+            const paramsAfter = traverseContext.parameters.length;
             result.push(...fields);
             fragements.push({
-                fragment: 'FROM ' + (0, select_columns_1.extractOriginalSql)(tableFactor) + '',
+                fragment: `FROM ${(0, select_columns_1.extractOriginalSql)(tableFactor)}`,
                 fields: [], //fields.map(field => ({ field: field.columnName, name: field.columnName, table: field.table })),
                 dependOnFields: [],
                 dependOnParams: [],
@@ -508,13 +523,13 @@ function traverseTableReferenceList(tableReferenceList, traverseContext, current
             if (((_a = joined.innerJoinType()) === null || _a === void 0 ? void 0 : _a.INNER_SYMBOL()) || ((_b = joined.innerJoinType()) === null || _b === void 0 ? void 0 : _b.JOIN_SYMBOL())) {
                 firstLeftJoinIndex = -1; //dont need to add notNull = false to joins
             }
-            else if (firstLeftJoinIndex == -1) {
+            else if (firstLeftJoinIndex === -1) {
                 firstLeftJoinIndex = index; //add notNull = false to all joins after the first left join
             }
             const tableReferences = joined.tableReference();
             if (tableReferences) {
                 const innerJoinFragment = {
-                    fragment: (0, select_columns_1.extractOriginalSql)(joined) + '',
+                    fragment: `${(0, select_columns_1.extractOriginalSql)(joined)}`,
                     fields: [],
                     dependOnFields: [],
                     dependOnParams: [],
@@ -528,16 +543,18 @@ function traverseTableReferenceList(tableReferenceList, traverseContext, current
                 //doesn't duplicate the fields of the USING clause. Ex. INNER JOIN mytable2 USING(id);
                 const joinedFieldsFiltered = usingFields.length > 0 ? filterUsingFields(joinedFields, usingFields) : joinedFields;
                 allJoinedColumns.push(joinedFieldsFiltered);
-                innerJoinFragment.fields = [...joinedFieldsFiltered.map(f => ({
+                innerJoinFragment.fields = [
+                    ...joinedFieldsFiltered.map((f) => ({
                         field: f.columnName,
                         table: f.tableAlias || f.table,
                         name: f.columnName
-                    }))];
+                    }))
+                ];
                 innerJoinFragment.parameters = Array.from({ length: paramsAfter - paramsBefore }, (x, i) => i + paramsAfter - 1);
                 fragements.push(innerJoinFragment);
                 const onClause = joined.expr(); //ON expr
                 if (onClause) {
-                    joinedFieldsFiltered.forEach(field => {
+                    joinedFieldsFiltered.forEach((field) => {
                         const fieldName = {
                             name: field.columnName,
                             prefix: field.tableAlias || ''
@@ -545,18 +562,18 @@ function traverseTableReferenceList(tableReferenceList, traverseContext, current
                         field.notNull = field.notNull || !(0, infer_column_nullability_1.possibleNull)(fieldName, onClause);
                     });
                     //apply inference to the parent join too
-                    result.forEach(field => {
+                    result.forEach((field) => {
                         const fieldName = {
                             name: field.columnName,
                             prefix: field.tableAlias || ''
                         };
                         field.notNull = field.notNull || !(0, infer_column_nullability_1.possibleNull)(fieldName, onClause);
                     });
-                    traverseExpr(onClause, Object.assign(Object.assign({}, traverseContext), { fromColumns: allJoinedColumns.flatMap(c => c).concat(result) }));
+                    traverseExpr(onClause, Object.assign(Object.assign({}, traverseContext), { fromColumns: allJoinedColumns.flat().concat(result) }));
                     const columns = (0, select_columns_1.getExpressions)(onClause, ts_mysql_parser_1.SimpleExprColumnRefContext);
-                    columns.forEach(columnRef => {
+                    columns.forEach((columnRef) => {
                         const fieldName = (0, select_columns_1.splitName)(columnRef.expr.getText());
-                        if ((innerJoinFragment === null || innerJoinFragment === void 0 ? void 0 : innerJoinFragment.relation) != fieldName.prefix) {
+                        if ((innerJoinFragment === null || innerJoinFragment === void 0 ? void 0 : innerJoinFragment.relation) !== fieldName.prefix) {
                             innerJoinFragment.parentRelation = fieldName.prefix;
                         }
                     });
@@ -564,8 +581,8 @@ function traverseTableReferenceList(tableReferenceList, traverseContext, current
             }
         });
         allJoinedColumns.forEach((joinedColumns, index) => {
-            joinedColumns.forEach(field => {
-                if (firstLeftJoinIndex != -1 && index >= firstLeftJoinIndex) {
+            joinedColumns.forEach((field) => {
+                if (firstLeftJoinIndex !== -1 && index >= firstLeftJoinIndex) {
                     const newField = Object.assign(Object.assign({}, field), { notNull: false });
                     result.push(newField);
                 }
@@ -595,12 +612,12 @@ function traverseTableFactor(tableFactor, traverseContext, currentFragment) {
         const subQuery = derivadTable.subquery();
         if (subQuery) {
             const subQueryResult = traverseSubquery(subQuery, traverseContext);
-            const result = subQueryResult.columns.map(t => {
+            const result = subQueryResult.columns.map((t) => {
                 const colDef = {
                     table: t.table ? tableAlias || '' : '',
                     columnName: t.name,
                     columnType: t.type,
-                    columnKey: "",
+                    columnKey: '',
                     notNull: t.notNull,
                     tableAlias: tableAlias
                 };
@@ -614,7 +631,7 @@ function traverseTableFactor(tableFactor, traverseContext, currentFragment) {
         const listParens = traverseTableReferenceListParens(tableReferenceListParens, traverseContext);
         return listParens;
     }
-    throw Error('traverseTableFactor - not supported: ' + tableFactor.constructor.name);
+    throw Error(`traverseTableFactor - not supported: ${tableFactor.constructor.name}`);
 }
 //tableReferenceList | tableReferenceListParens
 function traverseTableReferenceListParens(ctx, traverseContext) {
@@ -626,7 +643,7 @@ function traverseTableReferenceListParens(ctx, traverseContext) {
     if (tableReferenceListParens) {
         return traverseTableReferenceListParens(tableReferenceListParens, traverseContext);
     }
-    throw Error('traverseTableReferenceListParens - not supported: ' + ctx.constructor.name);
+    throw Error(`traverseTableReferenceListParens - not supported: ${ctx.constructor.name}`);
 }
 function traverseSingleTable(singleTable, dbSchema, withSchema, currentFragment, withFragments) {
     var _a;
@@ -636,8 +653,8 @@ function traverseSingleTable(singleTable, dbSchema, withSchema, currentFragment,
     if (currentFragment) {
         currentFragment.relation = tableAlias || tableName.name;
     }
-    withFragments === null || withFragments === void 0 ? void 0 : withFragments.forEach(withFragment => {
-        if (withFragment.relation == table) {
+    withFragments === null || withFragments === void 0 ? void 0 : withFragments.forEach((withFragment) => {
+        if (withFragment.relation === table) {
             withFragment.parentRelation = tableAlias || tableName.name;
         }
     });
@@ -654,23 +671,25 @@ function traverseSubquery(subQuery, traverseContext, cte, recursiveNames) {
     if (queryExpressionParens2) {
         return traverseQueryExpressionParens(queryExpressionParens2, traverseContext);
     }
-    throw Error('traverseSubquery - not expected: ' + subQuery.constructor.name);
+    throw Error(`traverseSubquery - not expected: ${subQuery.constructor.name}`);
 }
 function traverseSelectItemList(selectItemList, traverseContext) {
     const listType = [];
     if (selectItemList.MULT_OPERATOR()) {
-        traverseContext.fromColumns.forEach(col => {
+        traverseContext.fromColumns.forEach((col) => {
             // const columnType = createColumnType(col);
             const tableName = col.tableAlias || col.table;
             listType.push(Object.assign(Object.assign({}, col.columnType), { table: tableName }));
             const fieldFragment = {
                 fragment: `${tableName}.${col.columnName}`,
                 fragementWithoutAlias: `${tableName}.${col.columnName}`,
-                fields: [{
+                fields: [
+                    {
                         field: col.columnName,
                         name: col.columnName,
                         table: tableName
-                    }],
+                    }
+                ],
                 dependOnFields: [],
                 dependOnParams: [],
                 parameters: [],
@@ -681,14 +700,14 @@ function traverseSelectItemList(selectItemList, traverseContext) {
             }
         });
     }
-    selectItemList.selectItem_list().forEach(selectItem => {
+    selectItemList.selectItem_list().forEach((selectItem) => {
         var _a;
         const tableWild = selectItem.tableWild();
         if (tableWild) {
             if (tableWild.MULT_OPERATOR()) {
                 const itemName = (0, select_columns_1.splitName)(selectItem.getText());
                 const allColumns = selectAllColumns(itemName.prefix, traverseContext.fromColumns);
-                allColumns.forEach(col => {
+                allColumns.forEach((col) => {
                     const columnType = (0, collect_constraints_1.createColumnType)(col);
                     listType.push(columnType);
                 });
@@ -697,7 +716,7 @@ function traverseSelectItemList(selectItemList, traverseContext) {
         const expr = selectItem.expr();
         if (expr) {
             const selectFragment = {
-                fragment: (0, select_columns_1.extractOriginalSql)(selectItem) + '',
+                fragment: `${(0, select_columns_1.extractOriginalSql)(selectItem)}`,
                 fragementWithoutAlias: (0, select_columns_1.extractOriginalSql)(expr),
                 fields: [],
                 dependOnFields: [],
@@ -710,12 +729,12 @@ function traverseSelectItemList(selectItemList, traverseContext) {
                 (_a = traverseContext.dynamicSqlInfo.select) === null || _a === void 0 ? void 0 : _a.push(selectFragment);
             }
             // const fields = exprType.kind == 'TypeVar' ? [{ field: exprType.name, table: exprType.table + '', name: getColumnName(selectItem) }] : []
-            if (exprType.kind == 'TypeOperator') {
+            if (exprType.kind === 'TypeOperator') {
                 const subqueryType = exprType.types[0];
                 subqueryType.name = (0, select_columns_1.getColumnName)(selectItem);
                 listType.push(subqueryType);
             }
-            else if (exprType.kind == 'TypeVar') {
+            else if (exprType.kind === 'TypeVar') {
                 exprType.name = (0, select_columns_1.getColumnName)(selectItem);
                 listType.push(Object.assign({}, exprType)); //clone
             }
@@ -738,7 +757,7 @@ function traverseExpr(expr, traverseContext) {
         const boolPriType = traverseBoolPri(boolPri, traverseContext);
         if (traverseContext.where) {
             const currentFragment = {
-                fragment: 'AND ' + (0, select_columns_1.extractOriginalSql)(expr),
+                fragment: `AND ${(0, select_columns_1.extractOriginalSql)(expr)}`,
                 fields: [],
                 dependOnFields: [],
                 dependOnParams: [],
@@ -746,12 +765,12 @@ function traverseExpr(expr, traverseContext) {
                 dependOn: []
             };
             const paramsRight = (0, select_columns_1.getExpressions)(expr, ts_mysql_parser_1.SimpleExprParamMarkerContext);
-            paramsRight.forEach(_ => {
+            paramsRight.forEach((_) => {
                 currentFragment.dependOnParams.push(paramsCount);
                 paramsCount++;
             });
             const columnsRef = (0, select_columns_1.getExpressions)(expr, ts_mysql_parser_1.ColumnRefContext);
-            columnsRef.forEach(colRef => {
+            columnsRef.forEach((colRef) => {
                 const fileName = (0, select_columns_1.splitName)(colRef.expr.getText());
                 currentFragment.fields.push({
                     field: fileName.name,
@@ -769,17 +788,16 @@ function traverseExpr(expr, traverseContext) {
             return traverseExpr(expr2, traverseContext);
         }
         return (0, collect_constraints_1.freshVar)(expr.getText(), 'tinyint');
-        ;
     }
     if (expr instanceof ts_mysql_parser_1.ExprAndContext || expr instanceof ts_mysql_parser_1.ExprXorContext || expr instanceof ts_mysql_parser_1.ExprOrContext) {
         const all = [];
         (0, select_columns_1.getTopLevelAndExpr)(expr, all);
-        all.forEach(andExpression => {
+        all.forEach((andExpression) => {
             let paramsCount = traverseContext.parameters.length;
             traverseExpr(andExpression.expr, Object.assign(Object.assign({}, traverseContext), { where: false }));
             if (traverseContext.where) {
                 const currentFragment = {
-                    fragment: andExpression.operator + ' ' + (0, select_columns_1.extractOriginalSql)(andExpression.expr),
+                    fragment: `${andExpression.operator} ${(0, select_columns_1.extractOriginalSql)(andExpression.expr)}`,
                     fields: [],
                     dependOnFields: [],
                     dependOnParams: [],
@@ -787,12 +805,12 @@ function traverseExpr(expr, traverseContext) {
                     dependOn: []
                 };
                 const paramsRight = (0, select_columns_1.getExpressions)(andExpression.expr, ts_mysql_parser_1.SimpleExprParamMarkerContext);
-                paramsRight.forEach(_ => {
+                paramsRight.forEach((_) => {
                     currentFragment.dependOnParams.push(paramsCount);
                     paramsCount++;
                 });
                 const columnsRef = (0, select_columns_1.getExpressions)(andExpression.expr, ts_mysql_parser_1.ColumnRefContext);
-                columnsRef.forEach(colRef => {
+                columnsRef.forEach((colRef) => {
                     const fileName = (0, select_columns_1.splitName)(colRef.expr.getText());
                     currentFragment.fields.push({
                         field: fileName.name,
@@ -805,7 +823,7 @@ function traverseExpr(expr, traverseContext) {
         });
         return (0, collect_constraints_1.freshVar)(expr.getText(), 'tinyint');
     }
-    throw Error('traverseExpr - not supported: ' + expr.getText());
+    throw Error(`traverseExpr - not supported: ${expr.getText()}`);
 }
 function traverseBoolPri(boolPri, traverseContext) {
     if (boolPri instanceof ts_mysql_parser_1.PrimaryExprPredicateContext) {
@@ -841,12 +859,12 @@ function traverseBoolPri(boolPri, traverseContext) {
             type1: typeLeft,
             type2: {
                 kind: 'TypeOperator',
-                types: subQueryResult.columns.map(t => t.type)
+                types: subQueryResult.columns.map((t) => t.type)
             }
         });
         return (0, collect_constraints_1.freshVar)(boolPri.getText(), 'tinyint');
     }
-    throw Error('traverseExpr - not supported: ' + boolPri.constructor.name);
+    throw Error(`traverseExpr - not supported: ${boolPri.constructor.name}`);
 }
 function traversePredicate(predicate, traverseContext) {
     const bitExpr = predicate.bitExpr(0); //TODO - predicate length = 2? [1] == predicateOperations
@@ -854,7 +872,7 @@ function traversePredicate(predicate, traverseContext) {
     const predicateOperations = predicate.predicateOperations();
     if (predicateOperations) {
         const rightType = traversePredicateOperations(predicateOperations, bitExprType, traverseContext);
-        if (bitExprType.kind == 'TypeOperator' && rightType.kind == 'TypeOperator') {
+        if (bitExprType.kind === 'TypeOperator' && rightType.kind === 'TypeOperator') {
             rightType.types.forEach((t, i) => {
                 traverseContext.constraints.push({
                     expression: predicateOperations.getText(),
@@ -864,7 +882,7 @@ function traversePredicate(predicate, traverseContext) {
                 });
             });
         }
-        if (bitExprType.kind == 'TypeVar' && rightType.kind == 'TypeOperator') {
+        if (bitExprType.kind === 'TypeVar' && rightType.kind === 'TypeOperator') {
             rightType.types.forEach((t, i) => {
                 traverseContext.constraints.push({
                     expression: predicateOperations.getText(),
@@ -880,7 +898,7 @@ function traversePredicate(predicate, traverseContext) {
     return bitExprType;
 }
 function traverseExprList(exprList, traverseContext) {
-    const listType = exprList.expr_list().map(item => {
+    const listType = exprList.expr_list().map((item) => {
         const exprType = traverseExpr(item, traverseContext);
         return exprType;
     });
@@ -895,18 +913,18 @@ function traverseBitExpr(bitExpr, traverseContext) {
     if (simpleExpr) {
         return traverseSimpleExpr(simpleExpr, Object.assign(Object.assign({}, traverseContext), { where: false }));
     }
-    if (bitExpr.bitExpr_list().length == 2) {
+    if (bitExpr.bitExpr_list().length === 2) {
         const bitExprLeft = bitExpr.bitExpr(0);
         const typeLeftTemp = traverseBitExpr(bitExprLeft, traverseContext);
-        const typeLeft = typeLeftTemp.kind == 'TypeOperator' ? typeLeftTemp.types[0] : typeLeftTemp;
+        const typeLeft = typeLeftTemp.kind === 'TypeOperator' ? typeLeftTemp.types[0] : typeLeftTemp;
         //const newTypeLeft = typeLeft.name == '?'? freshVar('?', 'bigint') : typeLeft;
         const bitExprRight = bitExpr.bitExpr(1);
         const typeRightTemp = traverseBitExpr(bitExprRight, traverseContext);
         //In the expression 'id + (value + 2) + ?' the '(value+2)' is treated as a SimpleExprListContext and return a TypeOperator
-        const typeRight = typeRightTemp.kind == 'TypeOperator' ? typeRightTemp.types[0] : typeRightTemp;
+        const typeRight = typeRightTemp.kind === 'TypeOperator' ? typeRightTemp.types[0] : typeRightTemp;
         //const newTypeRight = typeRight.name == '?'? freshVar('?', 'bigint') : typeRight;
         const bitExprType = (0, collect_constraints_1.freshVar)(bitExpr.getText(), '?');
-        if (typeLeftTemp.kind == 'TypeVar' && typeRightTemp.kind == 'TypeVar' && typeLeftTemp.table == typeRightTemp.table) {
+        if (typeLeftTemp.kind === 'TypeVar' && typeRightTemp.kind === 'TypeVar' && typeLeftTemp.table === typeRightTemp.table) {
             bitExprType.table = typeLeftTemp.table;
         }
         //PRECISA?
@@ -967,14 +985,17 @@ function traverseBitExpr(bitExpr, traverseContext) {
         });
         return (0, collect_constraints_1.freshVar)('datetime', 'datetime');
     }
-    throw Error('traverseBitExpr - not supported: ' + bitExpr.constructor.name);
+    throw Error(`traverseBitExpr - not supported: ${bitExpr.constructor.name}`);
 }
 function traversePredicateOperations(predicateOperations, parentType, traverseContext) {
     if (predicateOperations instanceof ts_mysql_parser_1.PredicateExprInContext) {
         const subquery = predicateOperations.subquery();
         if (subquery) {
             const subQueryResult = traverseSubquery(subquery, traverseContext);
-            return { kind: 'TypeOperator', types: subQueryResult.columns.map(t => t.type) };
+            return {
+                kind: 'TypeOperator',
+                types: subQueryResult.columns.map((t) => t.type)
+            };
         }
         const exprList = predicateOperations.exprList();
         if (exprList) {
@@ -1014,7 +1035,7 @@ function traversePredicateOperations(predicateOperations, parentType, traverseCo
         });
         return bitExprType;
     }
-    throw Error("Not supported: " + predicateOperations.constructor.name);
+    throw Error(`Not supported: ${predicateOperations.constructor.name}`);
 }
 function traverseSimpleExpr(simpleExpr, traverseContext) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
@@ -1074,7 +1095,6 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             //     const typeFloat = freshVar('float', 'float');
             //     addNamedNode(simpleExpr, typeFloat, namedNodes)
             // }
-            ;
         }
         const boolLiteral = literal.boolLiteral();
         if (boolLiteral) {
@@ -1084,12 +1104,12 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         if (nullLiteral) {
             return (0, collect_constraints_1.freshVar)(nullLiteral.getText(), '?');
         }
-        throw Error('literal not supported:' + literal.getText());
+        throw Error(`literal not supported:${literal.getText()}`);
         //...
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprListContext) {
         const exprList = simpleExpr.exprList();
-        const listType = exprList.expr_list().map(item => {
+        const listType = exprList.expr_list().map((item) => {
             const exprType = traverseExpr(item, Object.assign(Object.assign({}, traverseContext), { where: false }));
             return exprType;
         });
@@ -1104,29 +1124,29 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         const subqueryResult = traverseSubquery(subquery, traverseContext);
         return {
             kind: 'TypeOperator',
-            types: subqueryResult.columns.map(t => (Object.assign(Object.assign({}, t.type), { table: '' })))
+            types: subqueryResult.columns.map((t) => (Object.assign(Object.assign({}, t.type), { table: '' })))
         };
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprCaseContext) {
         //case when expr then expr else expr
         const caseType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), '?');
-        simpleExpr.whenExpression_list().forEach(whenExprCont => {
+        simpleExpr.whenExpression_list().forEach((whenExprCont) => {
             const whenExpr = whenExprCont.expr();
             const whenType = traverseExpr(whenExpr, traverseContext);
             traverseContext.constraints.push({
                 expression: whenExpr.getText(),
-                type1: whenType.kind == 'TypeOperator' ? whenType.types[0] : whenType,
+                type1: whenType.kind === 'TypeOperator' ? whenType.types[0] : whenType,
                 type2: (0, collect_constraints_1.freshVar)('tinyint', 'tinyint') //bool
             });
         });
-        const thenTypes = simpleExpr.thenExpression_list().map(thenExprCtx => {
+        const thenTypes = simpleExpr.thenExpression_list().map((thenExprCtx) => {
             const thenExpr = thenExprCtx.expr();
             const thenType = traverseExpr(thenExpr, traverseContext);
             traverseContext.constraints.push({
                 expression: thenExprCtx.getText(),
                 type1: caseType,
-                type2: thenType.kind == 'TypeOperator' ? thenType.types[0] : thenType,
-                mostGeneralType: true,
+                type2: thenType.kind === 'TypeOperator' ? thenType.types[0] : thenType,
+                mostGeneralType: true
             });
             return thenType;
         });
@@ -1136,15 +1156,15 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             traverseContext.constraints.push({
                 expression: (_c = simpleExpr.elseExpression()) === null || _c === void 0 ? void 0 : _c.getText(),
                 type1: caseType,
-                type2: elseType.kind == 'TypeOperator' ? elseType.types[0] : elseType,
+                type2: elseType.kind === 'TypeOperator' ? elseType.types[0] : elseType,
                 mostGeneralType: true
             });
-            thenTypes.forEach(thenType => {
+            thenTypes.forEach((thenType) => {
                 var _a;
                 traverseContext.constraints.push({
                     expression: (_a = simpleExpr.elseExpression()) === null || _a === void 0 ? void 0 : _a.getText(),
                     type1: thenType,
-                    type2: elseType.kind == 'TypeOperator' ? elseType.types[0] : elseType,
+                    type2: elseType.kind === 'TypeOperator' ? elseType.types[0] : elseType,
                     mostGeneralType: true
                 });
             });
@@ -1162,7 +1182,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             type1: typeLeft,
             type2: (0, collect_constraints_1.freshVar)('bigint', 'bigint')
         });
-        if (typeRight.kind == 'TypeVar' && ((0, collect_constraints_1.isDateLiteral)(typeRight.name) || (0, collect_constraints_1.isDateTimeLiteral)(typeRight.name))) {
+        if (typeRight.kind === 'TypeVar' && ((0, collect_constraints_1.isDateLiteral)(typeRight.name) || (0, collect_constraints_1.isDateTimeLiteral)(typeRight.name))) {
             typeRight.type = 'datetime';
         }
         traverseContext.constraints.push({
@@ -1208,7 +1228,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                     mostGeneralType: true,
                     coercionType: 'SumFunction'
                 });
-                if (inSumExprType.kind == 'TypeVar') {
+                if (inSumExprType.kind === 'TypeVar') {
                     functionType.table = inSumExprType.table;
                 }
             }
@@ -1217,7 +1237,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         if (sumExpr.GROUP_CONCAT_SYMBOL()) {
             const exprList = sumExpr.exprList();
             if (exprList) {
-                exprList.expr_list().map(item => {
+                exprList.expr_list().map((item) => {
                     const exprType = traverseExpr(item, traverseContext);
                     return exprType;
                 });
@@ -1227,10 +1247,9 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                 */
                 //TODO - Infer TEXT/BLOB or VARCHAR/VARBINARY
                 return (0, collect_constraints_1.freshVar)(sumExpr.getText(), 'varchar');
-                ;
             }
         }
-        throw Error('Expression not supported: ' + sumExpr.constructor.name);
+        throw Error(`Expression not supported: ${sumExpr.constructor.name}`);
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprRuntimeFunctionContext) {
         const runtimeFunctionCall = simpleExpr.runtimeFunctionCall();
@@ -1245,7 +1264,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         }
         if (runtimeFunctionCall.REPLACE_SYMBOL()) {
             const exprList = runtimeFunctionCall.expr_list();
-            exprList.forEach(expr => {
+            exprList.forEach((expr) => {
                 const exprType = traverseExpr(expr, traverseContext);
                 traverseContext.constraints.push({
                     expression: expr.getText(),
@@ -1259,10 +1278,10 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             const expr = (_g = runtimeFunctionCall.exprWithParentheses()) === null || _g === void 0 ? void 0 : _g.expr();
             if (expr) {
                 const paramType = traverseExpr(expr, traverseContext);
-                if (paramType.kind == 'TypeVar' && (0, collect_constraints_1.isDateTimeLiteral)(paramType.name)) {
+                if (paramType.kind === 'TypeVar' && (0, collect_constraints_1.isDateTimeLiteral)(paramType.name)) {
                     paramType.type = 'datetime';
                 }
-                if (paramType.kind == 'TypeVar' && (0, collect_constraints_1.isDateLiteral)(paramType.name)) {
+                if (paramType.kind === 'TypeVar' && (0, collect_constraints_1.isDateLiteral)(paramType.name)) {
                     paramType.type = 'date';
                 }
                 traverseContext.constraints.push({
@@ -1278,10 +1297,10 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             const expr = (_h = runtimeFunctionCall.exprWithParentheses()) === null || _h === void 0 ? void 0 : _h.expr();
             if (expr) {
                 const paramType = traverseExpr(expr, traverseContext);
-                if (paramType.kind == 'TypeVar' && (0, collect_constraints_1.isDateTimeLiteral)(paramType.name)) {
+                if (paramType.kind === 'TypeVar' && (0, collect_constraints_1.isDateTimeLiteral)(paramType.name)) {
                     paramType.type = 'datetime';
                 }
-                if (paramType.kind == 'TypeVar' && (0, collect_constraints_1.isDateLiteral)(paramType.name)) {
+                if (paramType.kind === 'TypeVar' && (0, collect_constraints_1.isDateLiteral)(paramType.name)) {
                     paramType.type = 'date';
                 }
                 traverseContext.constraints.push({
@@ -1296,13 +1315,13 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             const expr = (_j = runtimeFunctionCall.exprWithParentheses()) === null || _j === void 0 ? void 0 : _j.expr();
             if (expr) {
                 const paramType = traverseExpr(expr, traverseContext);
-                if (paramType.kind == 'TypeVar' && (0, collect_constraints_1.isTimeLiteral)(paramType.name)) {
+                if (paramType.kind === 'TypeVar' && (0, collect_constraints_1.isTimeLiteral)(paramType.name)) {
                     paramType.type = 'time';
                 }
-                if (paramType.kind == 'TypeVar' && (0, collect_constraints_1.isDateLiteral)(paramType.name)) {
+                if (paramType.kind === 'TypeVar' && (0, collect_constraints_1.isDateLiteral)(paramType.name)) {
                     paramType.type = 'date';
                 }
-                if (paramType.kind == 'TypeVar' && (0, collect_constraints_1.isDateTimeLiteral)(paramType.name)) {
+                if (paramType.kind === 'TypeVar' && (0, collect_constraints_1.isDateTimeLiteral)(paramType.name)) {
                     paramType.type = 'datetime';
                 }
                 traverseContext.constraints.push({
@@ -1319,7 +1338,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         const trimFunction = runtimeFunctionCall.trimFunction();
         if (trimFunction) {
             const exprList = trimFunction.expr_list();
-            if (exprList.length == 1) {
+            if (exprList.length === 1) {
                 const exprType = traverseExpr(exprList[0], traverseContext);
                 traverseContext.constraints.push({
                     expression: exprList[0].getText(),
@@ -1327,7 +1346,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                     type2: (0, collect_constraints_1.freshVar)('varchar', 'varchar')
                 });
             }
-            if (exprList.length == 2) {
+            if (exprList.length === 2) {
                 const exprType = traverseExpr(exprList[0], traverseContext);
                 const expr2Type = traverseExpr(exprList[1], traverseContext);
                 traverseContext.constraints.push({
@@ -1355,17 +1374,17 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             traverseExprListParameters(exprList, params, traverseContext);
             return varcharParam;
         }
-        if (runtimeFunctionCall.ADDDATE_SYMBOL()
-            || runtimeFunctionCall.DATE_ADD_SYMBOL()
-            || runtimeFunctionCall.SUBDATE_SYMBOL()
-            || runtimeFunctionCall.DATE_SUB_SYMBOL()) {
+        if (runtimeFunctionCall.ADDDATE_SYMBOL() ||
+            runtimeFunctionCall.DATE_ADD_SYMBOL() ||
+            runtimeFunctionCall.SUBDATE_SYMBOL() ||
+            runtimeFunctionCall.DATE_SUB_SYMBOL()) {
             //SELECT ADDDATE('2008-01-02', INTERVAL 31 DAY)
             //SELECT ADDDATE('2008-01-02', 31)
             const expr1 = runtimeFunctionCall.expr(0);
             const expr2 = runtimeFunctionCall.expr(1);
             const typeExpr1 = traverseExpr(expr1, traverseContext);
             const typeExpr2 = traverseExpr(expr2, traverseContext);
-            if (typeExpr1.kind == 'TypeVar' && ((0, collect_constraints_1.isDateLiteral)(typeExpr1.name) || (0, collect_constraints_1.isDateTimeLiteral)(typeExpr1.name))) {
+            if (typeExpr1.kind === 'TypeVar' && ((0, collect_constraints_1.isDateLiteral)(typeExpr1.name) || (0, collect_constraints_1.isDateTimeLiteral)(typeExpr1.name))) {
                 typeExpr1.type = 'datetime';
             }
             traverseContext.constraints.push({
@@ -1391,7 +1410,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                 const paramsTypeList = traverseExprListParameters(exprList, params, traverseContext);
                 paramsTypeList.forEach((typeVar, paramIndex) => {
                     traverseContext.constraints.push({
-                        expression: runtimeFunctionCall.getText() + '_param' + (paramIndex + 1),
+                        expression: `${runtimeFunctionCall.getText()}_param${paramIndex + 1}`,
                         type1: paramType,
                         type2: typeVar,
                         mostGeneralType: true,
@@ -1451,7 +1470,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             });
             return expr2Type;
         }
-        throw Error('Function not supported: ' + runtimeFunctionCall.getText());
+        throw Error(`Function not supported: ${runtimeFunctionCall.getText()}`);
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprFunctionContext) {
         const functionIdentifier = (0, collect_constraints_1.getFunctionName)(simpleExpr);
@@ -1530,7 +1549,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             }
             return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'bigint');
         }
-        if (functionIdentifier === 'period_add' || functionIdentifier == 'period_diff') {
+        if (functionIdentifier === 'period_add' || functionIdentifier === 'period_diff') {
             const udfExprList = (_m = simpleExpr.functionCall().udfExprList()) === null || _m === void 0 ? void 0 : _m.udfExpr_list();
             if (udfExprList) {
                 udfExprList.forEach((inExpr) => {
@@ -1546,7 +1565,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             }
             return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'bigint');
         }
-        if (functionIdentifier === 'lpad' || functionIdentifier == 'rpad') {
+        if (functionIdentifier === 'lpad' || functionIdentifier === 'rpad') {
             const varcharParam = (0, collect_constraints_1.freshVar)('varchar', 'varchar');
             const intParam = (0, collect_constraints_1.freshVar)('int', 'int');
             const params = {
@@ -1556,13 +1575,13 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             walkFunctionParameters(simpleExpr, params, traverseContext);
             return varcharParam;
         }
-        if (functionIdentifier === 'lower'
-            || functionIdentifier === 'lcase'
-            || functionIdentifier === 'upper'
-            || functionIdentifier === 'ucase'
-            || functionIdentifier === 'trim'
-            || functionIdentifier === 'ltrim'
-            || functionIdentifier === 'rtrim') {
+        if (functionIdentifier === 'lower' ||
+            functionIdentifier === 'lcase' ||
+            functionIdentifier === 'upper' ||
+            functionIdentifier === 'ucase' ||
+            functionIdentifier === 'trim' ||
+            functionIdentifier === 'ltrim' ||
+            functionIdentifier === 'rtrim') {
             const varcharParam = (0, collect_constraints_1.freshVar)('varchar', 'varchar');
             const params = {
                 kind: 'FixedLengthParams',
@@ -1571,7 +1590,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             walkFunctionParameters(simpleExpr, params, traverseContext);
             return varcharParam;
         }
-        if (functionIdentifier === 'length' || functionIdentifier == 'char_length') {
+        if (functionIdentifier === 'length' || functionIdentifier === 'char_length') {
             const varcharParam = (0, collect_constraints_1.freshVar)('varchar', 'varchar');
             const params = {
                 kind: 'FixedLengthParams',
@@ -1583,7 +1602,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         if (functionIdentifier === 'abs') {
             const functionType = (0, collect_constraints_1.freshVar)('number', 'number');
             const udfExprList = (_o = simpleExpr.functionCall().udfExprList()) === null || _o === void 0 ? void 0 : _o.udfExpr_list();
-            udfExprList === null || udfExprList === void 0 ? void 0 : udfExprList.forEach(expr => {
+            udfExprList === null || udfExprList === void 0 ? void 0 : udfExprList.forEach((expr) => {
                 const param1 = traverseExpr(expr.expr(), traverseContext);
                 traverseContext.constraints.push({
                     expression: simpleExpr.getText(),
@@ -1595,10 +1614,10 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             });
             return functionType;
         }
-        if (functionIdentifier == 'ceiling' || functionIdentifier == 'ceil') {
+        if (functionIdentifier === 'ceiling' || functionIdentifier === 'ceil') {
             const functionType = (0, collect_constraints_1.freshVar)('number', 'number');
             const udfExprList = (_p = simpleExpr.functionCall().udfExprList()) === null || _p === void 0 ? void 0 : _p.udfExpr_list();
-            udfExprList === null || udfExprList === void 0 ? void 0 : udfExprList.forEach(expr => {
+            udfExprList === null || udfExprList === void 0 ? void 0 : udfExprList.forEach((expr) => {
                 const param1 = traverseExpr(expr.expr(), traverseContext);
                 traverseContext.constraints.push({
                     expression: simpleExpr.getText(),
@@ -1610,12 +1629,12 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             });
             return functionType;
         }
-        if (functionIdentifier == 'timestampdiff') {
+        if (functionIdentifier === 'timestampdiff') {
             const udfExprList = (_q = simpleExpr.functionCall().udfExprList()) === null || _q === void 0 ? void 0 : _q.udfExpr_list();
             if (udfExprList) {
                 const [first, ...rest] = udfExprList;
                 const unit = first.getText().trim().toLowerCase();
-                rest.forEach((inExpr, paramIndex) => {
+                rest.forEach((inExpr) => {
                     const expr = inExpr.expr();
                     const exprType = traverseExpr(expr, traverseContext);
                     const newType = (0, collect_constraints_1.verifyDateTypesCoercion)(exprType);
@@ -1630,7 +1649,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             }
             return (0, collect_constraints_1.freshVar)('int', 'int');
         }
-        if (functionIdentifier == 'ifnull' || functionIdentifier == 'nullif') {
+        if (functionIdentifier === 'ifnull' || functionIdentifier === 'nullif') {
             const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), '?');
             const udfExprList = (_r = simpleExpr.functionCall().udfExprList()) === null || _r === void 0 ? void 0 : _r.udfExpr_list();
             if (udfExprList) {
@@ -1650,9 +1669,10 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             }
             return functionType;
         }
-        if (functionIdentifier == 'md5' //md5(str) - TODO - have input constraint = string
-            || functionIdentifier == 'hex' //md5(n or str)
-            || functionIdentifier == 'unhex') { //unhex (str) - TODO - have input constraint = string
+        if (functionIdentifier === 'md5' || //md5(str) - TODO - have input constraint = string
+            functionIdentifier === 'hex' || //md5(n or str)
+            functionIdentifier === 'unhex') {
+            //unhex (str) - TODO - have input constraint = string
             const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'char');
             const udfExprList = (_s = simpleExpr.functionCall().udfExprList()) === null || _s === void 0 ? void 0 : _s.udfExpr_list();
             if (udfExprList) {
@@ -1666,7 +1686,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             }
             return functionType;
         }
-        throw Error('Function not supported: ' + functionIdentifier);
+        throw Error(`Function not supported: ${functionIdentifier}`);
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprWindowingFunctionContext) {
         const windowFunctionCall = simpleExpr.windowFunctionCall();
@@ -1678,14 +1698,14 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             return (0, collect_constraints_1.freshVar)(castType.getText(), 'char');
         }
     }
-    throw Error('traverseSimpleExpr - not supported: ' + simpleExpr.constructor.name);
+    throw Error(`traverseSimpleExpr - not supported: ${simpleExpr.constructor.name}`);
 }
 function traverseWindowFunctionCall(windowFunctionCall, traverseContext) {
-    if (windowFunctionCall.ROW_NUMBER_SYMBOL()
-        || windowFunctionCall.RANK_SYMBOL()
-        || windowFunctionCall.DENSE_RANK_SYMBOL()
-        || windowFunctionCall.CUME_DIST_SYMBOL()
-        || windowFunctionCall.PERCENT_RANK_SYMBOL()) {
+    if (windowFunctionCall.ROW_NUMBER_SYMBOL() ||
+        windowFunctionCall.RANK_SYMBOL() ||
+        windowFunctionCall.DENSE_RANK_SYMBOL() ||
+        windowFunctionCall.CUME_DIST_SYMBOL() ||
+        windowFunctionCall.PERCENT_RANK_SYMBOL()) {
         return (0, collect_constraints_1.freshVar)(windowFunctionCall.getText(), 'bigint');
     }
     const expr = windowFunctionCall.expr();
@@ -1697,12 +1717,12 @@ function traverseWindowFunctionCall(windowFunctionCall, traverseContext) {
         const expr = exprWithParentheses.expr();
         return traverseExpr(expr, traverseContext);
     }
-    throw Error('No support for expression' + windowFunctionCall.constructor.name);
+    throw Error(`No support for expression${windowFunctionCall.constructor.name}`);
 }
 function traverseExprListParameters(exprList, params, traverseContext) {
     return exprList.map((expr, paramIndex) => {
         const exprType = traverseExpr(expr, traverseContext);
-        const paramType = params.kind == 'FixedLengthParams' ? params.paramsType[paramIndex] : (0, collect_constraints_1.freshVar)(params.paramType, params.paramType);
+        const paramType = params.kind === 'FixedLengthParams' ? params.paramsType[paramIndex] : (0, collect_constraints_1.freshVar)(params.paramType, params.paramType);
         traverseContext.constraints.push({
             expression: expr.getText(),
             type1: exprType,
@@ -1718,8 +1738,8 @@ function walkFunctionParameters(simpleExprFunction, params, traverseContext) {
     const udfExprList = (_a = simpleExprFunction.functionCall().udfExprList()) === null || _a === void 0 ? void 0 : _a.udfExpr_list();
     if (udfExprList) {
         const paramTypes = udfExprList
-            .filter((undefined, paramIndex) => {
-            return functionName == 'timestampdiff' ? paramIndex != 0 : true; //filter the first parameter of timestampdiff function
+            .filter((_, paramIndex) => {
+            return functionName === 'timestampdiff' ? paramIndex !== 0 : true; //filter the first parameter of timestampdiff function
         })
             .map((inExpr, paramIndex) => {
             const expr = inExpr.expr();
@@ -1727,7 +1747,7 @@ function walkFunctionParameters(simpleExprFunction, params, traverseContext) {
             traverseContext.constraints.push({
                 expression: expr.getText(),
                 type1: exprType,
-                type2: params.kind == 'FixedLengthParams' ? params.paramsType[paramIndex] : (0, collect_constraints_1.freshVar)(params.paramType, params.paramType),
+                type2: params.kind === 'FixedLengthParams' ? params.paramsType[paramIndex] : (0, collect_constraints_1.freshVar)(params.paramType, params.paramType)
             });
             return exprType;
         });
@@ -1739,7 +1759,7 @@ function walkFunctionParameters(simpleExprFunction, params, traverseContext) {
             const inSumExprType = traverseExpr(inExpr, traverseContext);
             traverseContext.constraints.push({
                 expression: inExpr.getText(),
-                type1: params.kind == 'FixedLengthParams' ? params.paramsType[paramIndex] : (0, collect_constraints_1.freshVar)(params.paramType, params.paramType),
+                type1: params.kind === 'FixedLengthParams' ? params.paramsType[paramIndex] : (0, collect_constraints_1.freshVar)(params.paramType, params.paramType),
                 type2: inSumExprType,
                 mostGeneralType: true
             });
@@ -1750,32 +1770,36 @@ function walkFunctionParameters(simpleExprFunction, params, traverseContext) {
     throw Error('Error in walkFunctionParameters');
 }
 function filterColumns(dbSchema, withSchema, tableAlias, table) {
-    const withResult = withSchema.filter(t => t.table.toLowerCase() == table.name.toLowerCase()).map(s => (Object.assign(Object.assign({}, s), { tableAlias: tableAlias })));
+    const withResult = withSchema
+        .filter((t) => t.table.toLowerCase() === table.name.toLowerCase())
+        .map((s) => (Object.assign(Object.assign({}, s), { tableAlias: tableAlias })));
     const tableColumns1 = dbSchema
-        .filter(schema => schema.table.toLowerCase() == table.name.toLowerCase() && (schema.schema == table.prefix || table.prefix == ''))
-        .map(tableColumn => {
+        .filter((schema) => schema.table.toLowerCase() === table.name.toLowerCase() && (schema.schema === table.prefix || table.prefix === ''))
+        .map((tableColumn) => {
         //name and colum are the same on the leaf table
         const r = {
-            columnName: tableColumn.column, columnType: (0, collect_constraints_1.createColumnTypeFomColumnSchema)(tableColumn),
-            notNull: tableColumn.notNull, table: table.name, tableAlias: tableAlias || '', columnKey: tableColumn.columnKey
+            columnName: tableColumn.column,
+            columnType: (0, collect_constraints_1.createColumnTypeFomColumnSchema)(tableColumn),
+            notNull: tableColumn.notNull,
+            table: table.name,
+            tableAlias: tableAlias || '',
+            columnKey: tableColumn.columnKey
         };
         return r;
     });
     const result = tableColumns1.concat(withResult);
     return result;
 }
-exports.filterColumns = filterColumns;
 function selectAllColumns(tablePrefix, fromColumns) {
-    return fromColumns.filter(column => {
-        if (tablePrefix == '' || tablePrefix == column.tableAlias || tablePrefix == column.table) {
+    return fromColumns.filter((column) => {
+        if (tablePrefix === '' || tablePrefix === column.tableAlias || tablePrefix === column.table) {
             return true;
         }
         return false;
     });
 }
-exports.selectAllColumns = selectAllColumns;
 function filterUsingFields(joinedFields, usingFields) {
-    return joinedFields.filter(joinedField => {
+    return joinedFields.filter((joinedField) => {
         const isUsing = usingFields.includes(joinedField.columnName);
         if (!isUsing) {
             return true;
@@ -1789,12 +1813,13 @@ function isMultipleRowResult(selectStatement, fromColumns) {
         return false;
     }
     const querySpecs = (0, parse_1.getAllQuerySpecificationsFromSelectStatement)(selectStatement);
-    if (querySpecs.length == 1) { //UNION queries are multipleRowsResult = true
+    if (querySpecs.length === 1) {
+        //UNION queries are multipleRowsResult = true
         const fromClause = querySpecs[0].fromClause();
         if (!fromClause) {
             return false;
         }
-        if (querySpecs[0].selectItemList().getChildCount() == 1) {
+        if (querySpecs[0].selectItemList().getChildCount() === 1) {
             const selectItem = querySpecs[0].selectItemList().getChild(0);
             //if selectItem = * (TerminalNode) childCount = 0; selectItem.expr() throws exception
             const expr = selectItem.getChildCount() > 0 ? selectItem.expr() : null;
@@ -1812,19 +1837,18 @@ function isMultipleRowResult(selectStatement, fromColumns) {
         }
         const whereClauseExpr = (_b = querySpecs[0].whereClause()) === null || _b === void 0 ? void 0 : _b.expr();
         const isMultipleRowResult = whereClauseExpr && verifyMultipleResult2(whereClauseExpr, fromColumns);
-        if (isMultipleRowResult == false) {
+        if (isMultipleRowResult === false) {
             return false;
         }
     }
     return true;
 }
-exports.isMultipleRowResult = isMultipleRowResult;
 function isLimitOne(selectStatement) {
     const limitOptions = (0, parse_1.getLimitOptions)(selectStatement);
-    if (limitOptions.length == 1 && limitOptions[0].getText() == '1') {
+    if (limitOptions.length === 1 && limitOptions[0].getText() === '1') {
         return true;
     }
-    if (limitOptions.length == 2 && limitOptions[1].getText() == '1') {
+    if (limitOptions.length === 2 && limitOptions[1].getText() === '1') {
         return true;
     }
     return false;
@@ -1834,8 +1858,8 @@ function verifyMultipleResult2(exprContext, fromColumns) {
         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();
+                const compareLeft = boolPri.boolPri();
+                const compareRight = boolPri.predicate();
                 if (isUniqueKeyComparation(compareLeft, fromColumns) || isUniqueKeyComparation(compareRight, fromColumns)) {
                     return false; //multipleRow = false
                 }
@@ -1848,8 +1872,8 @@ function verifyMultipleResult2(exprContext, fromColumns) {
         return true;
     }
     if (exprContext instanceof ts_mysql_parser_1.ExprAndContext) {
-        const oneIsSingleResult = exprContext.expr_list().some(expr => verifyMultipleResult2(expr, fromColumns) == false);
-        return oneIsSingleResult == false;
+        const oneIsSingleResult = exprContext.expr_list().some((expr) => verifyMultipleResult2(expr, fromColumns) === false);
+        return oneIsSingleResult === false;
     }
     // if (exprContext instanceof ExprXorContext) {
     //     const expressions = exprContext.expr();
@@ -1857,15 +1881,15 @@ function verifyMultipleResult2(exprContext, fromColumns) {
     if (exprContext instanceof ts_mysql_parser_1.ExprOrContext) {
         return true; //multipleRow = true
     }
-    throw Error('Unknow type:' + exprContext.constructor.name);
+    throw Error(`Unknow type:${exprContext.constructor.name}`);
 }
-exports.verifyMultipleResult2 = verifyMultipleResult2;
 function isUniqueKeyComparation(compare, fromColumns) {
     const tokens = (0, select_columns_1.getSimpleExpressions)(compare);
-    if (tokens.length == 1 && tokens[0] instanceof ts_mysql_parser_1.SimpleExprColumnRefContext) {
+    if (tokens.length === 1 && tokens[0] instanceof ts_mysql_parser_1.SimpleExprColumnRefContext) {
         const fieldName = (0, select_columns_1.splitName)(tokens[0].getText());
         const col = (0, select_columns_1.findColumn)(fieldName, fromColumns);
-        if (col.columnKey == 'PRI' || col.columnKey == 'UNI') { //TODO - UNIQUE
+        if (col.columnKey === 'PRI' || col.columnKey === 'UNI') {
+            //TODO - UNIQUE
             return true; //isUniqueKeyComparation = true
         }
     }
@@ -1876,7 +1900,7 @@ function getOrderByColumns(fromColumns, selectColumns) {
     fromColumns.forEach((col) => {
         const ambiguous = isAmbiguous(fromColumns, col.columnName);
         if (!ambiguous) {
-            const exists = orderByColumns.find(orderBy => orderBy == col.columnName);
+            const exists = orderByColumns.find((orderBy) => orderBy === col.columnName);
             if (!exists) {
                 orderByColumns.push(col.columnName);
             }
@@ -1888,10 +1912,10 @@ function getOrderByColumns(fromColumns, selectColumns) {
             orderByColumns.push(`${col.table}.${col.columnName}`);
         }
     });
-    selectColumns.forEach(col => {
-        const duplicated = selectColumns.filter(orderBy => orderBy.name == col.name);
+    selectColumns.forEach((col) => {
+        const duplicated = selectColumns.filter((orderBy) => orderBy.name === col.name);
         if (duplicated.length <= 1) {
-            const exists = orderByColumns.find(orderBy => orderBy == col.name);
+            const exists = orderByColumns.find((orderBy) => orderBy === col.name);
             if (!exists) {
                 orderByColumns.push(col.name);
             }
@@ -1899,9 +1923,8 @@ function getOrderByColumns(fromColumns, selectColumns) {
     });
     return orderByColumns;
 }
-exports.getOrderByColumns = getOrderByColumns;
 function isAmbiguous(columns, columnName) {
-    const filterByName = columns.filter(col => col.columnName == columnName);
+    const filterByName = columns.filter((col) => col.columnName === columnName);
     return filterByName.length > 1;
 }
 //# sourceMappingURL=traverse.js.map