typesql-cli 0.7.0 → 0.7.1

package/mysql-query-analyzer/traverse.js

@@ -18,8 +18,12 @@ function traverseQueryContext(queryContext, dbSchema, namedParameters) {
         dbSchema,
         parameters,
         fromColumns: [],
+        subQueryColumns: [],
+        subQuery: false,
+        where: false,
         withSchema: [],
         dynamicSqlInfo: {
+            with: [],
             select: [],
             from: [],
             where: []
@@ -309,14 +313,14 @@ function traverseQueryExpressionOrParens(queryExpressionOrParens, traverseContex
     }
     throw Error("walkQueryExpressionOrParens");
 }
-function traverseQueryExpression(queryExpression, traverseContext, subQuery = false, recursiveNames) {
+function traverseQueryExpression(queryExpression, traverseContext, recursiveNames) {
     const withClause = queryExpression.withClause();
     if (withClause) {
         traverseWithClause(withClause, traverseContext);
     }
     const queryExpressionBody = queryExpression.queryExpressionBody();
     if (queryExpressionBody) {
-        return traverseQueryExpressionBody(queryExpressionBody, traverseContext, subQuery, recursiveNames);
+        return traverseQueryExpressionBody(queryExpressionBody, traverseContext, recursiveNames);
     }
     const queryExpressionParens = queryExpression.queryExpressionParens();
     if (queryExpressionParens) {
@@ -327,7 +331,7 @@ function traverseQueryExpression(queryExpression, traverseContext, subQuery = fa
 function traverseQueryExpressionParens(queryExpressionParens, traverseContext, recursiveNames) {
     const queryExpression = queryExpressionParens.queryExpression();
     if (queryExpression) {
-        return traverseQueryExpression(queryExpression, traverseContext, false, recursiveNames);
+        return traverseQueryExpression(queryExpression, traverseContext, recursiveNames);
     }
     const queryExpressionParens2 = queryExpressionParens.queryExpressionParens();
     if (queryExpressionParens2) {
@@ -339,16 +343,16 @@ function createUnionVar(type, name) {
     const newVar = Object.assign(Object.assign({}, type), { name: name, table: '' });
     return newVar;
 }
-function traverseQueryExpressionBody(queryExpressionBody, traverseContext, subQuery = false, recursiveNames) {
+function traverseQueryExpressionBody(queryExpressionBody, traverseContext, recursiveNames) {
     const allQueries = (0, parse_1.getAllQuerySpecificationsFromSelectStatement)(queryExpressionBody);
     const [first, ...unionQuerySpec] = allQueries;
-    const mainQueryResult = traverseQuerySpecification(first, traverseContext, subQuery);
+    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?
     for (let queryIndex = 0; queryIndex < unionQuerySpec.length; queryIndex++) {
         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 }), subQuery);
+        const unionResult = traverseQuerySpecification(unionQuery, Object.assign(Object.assign({}, traverseContext), { fromColumns: newFromColumns }));
         resultTypes.forEach((t2, index) => {
             mainQueryResult.columns[index].notNull = mainQueryResult.columns[index].notNull && unionResult.columns[index].notNull;
             traverseContext.constraints.push({
@@ -388,16 +392,16 @@ function renameFromColumns(fromColumns, recursiveNames) {
     });
     return newFromColumns;
 }
-function traverseQuerySpecification(querySpec, traverseContext, subQuery = false) {
+function traverseQuerySpecification(querySpec, traverseContext) {
     const fromClause = querySpec.fromClause();
-    const fromColumnsFrom = fromClause ? traverseFromClause(fromClause, traverseContext, subQuery) : [];
-    const allColumns = subQuery ? traverseContext.fromColumns.concat(fromColumnsFrom) : fromColumnsFrom; //(... where id = t1.id)
-    const selectItemListResult = traverseSelectItemList(querySpec.selectItemList(), Object.assign(Object.assign({}, traverseContext), { fromColumns: allColumns }), subQuery);
+    const fromColumnsFrom = fromClause ? traverseFromClause(fromClause, traverseContext) : [];
+    const allColumns = traverseContext.subQuery ? traverseContext.fromColumns.concat(fromColumnsFrom) : fromColumnsFrom; //(... where id = t1.id)
+    const selectItemListResult = traverseSelectItemList(querySpec.selectItemList(), Object.assign(Object.assign({}, traverseContext), { fromColumns: allColumns, subQueryColumns: fromColumnsFrom }));
     const whereClause = querySpec.whereClause();
     //TODO - HAVING, BLAH
     if (whereClause) {
         const whereExpr = whereClause === null || whereClause === void 0 ? void 0 : whereClause.expr();
-        traverseExpr(whereExpr, Object.assign(Object.assign({}, traverseContext), { fromColumns: allColumns }), !subQuery);
+        traverseExpr(whereExpr, Object.assign(Object.assign({}, traverseContext), { fromColumns: allColumns, subQueryColumns: fromColumnsFrom, where: !traverseContext.subQuery }));
     }
     const columnNullability = (0, infer_column_nullability_1.inferNotNull)(querySpec, traverseContext.dbSchema, allColumns);
     const columns = selectItemListResult.types.map((t, index) => {
@@ -432,7 +436,7 @@ exports.traverseQuerySpecification = traverseQuerySpecification;
 function traverseWithClause(withClause, traverseContext) {
     //result1, result2
     withClause.commonTableExpression().forEach(commonTableExpression => {
-        var _a;
+        var _a, _b;
         const identifier = commonTableExpression.identifier().text;
         const recursiveNames = withClause.RECURSIVE_SYMBOL() ? ((_a = commonTableExpression.columnInternalRefList()) === null || _a === void 0 ? void 0 : _a.columnInternalRef().map(t => t.text)) || [] : undefined;
         const subQuery = commonTableExpression.subquery();
@@ -447,16 +451,25 @@ function traverseWithClause(withClause, traverseContext) {
             };
             traverseContext.withSchema.push(withCol);
         });
+        (_b = traverseContext.dynamicSqlInfo.with) === null || _b === void 0 ? void 0 : _b.push({
+            fragment: (0, select_columns_1.extractOriginalSql)(commonTableExpression) + '',
+            relation: identifier,
+            fields: [],
+            dependOnFields: [],
+            dependOnParams: [],
+            parameters: [],
+            dependOn: []
+        });
     });
 }
 exports.traverseWithClause = traverseWithClause;
-function traverseFromClause(fromClause, traverseContext, subQuery = false) {
+function traverseFromClause(fromClause, traverseContext) {
     var _a;
     const tableReferenceList = (_a = fromClause.tableReferenceList()) === null || _a === void 0 ? void 0 : _a.tableReference();
-    const fromColumns = tableReferenceList ? traverseTableReferenceList(tableReferenceList, traverseContext, null, subQuery) : [];
+    const fromColumns = tableReferenceList ? traverseTableReferenceList(tableReferenceList, traverseContext, null) : [];
     return fromColumns;
 }
-function traverseTableReferenceList(tableReferenceList, traverseContext, currentFragment, subQuery = false) {
+function traverseTableReferenceList(tableReferenceList, traverseContext, currentFragment) {
     const result = [];
     const fragements = [];
     tableReferenceList.forEach(tab => {
@@ -529,7 +542,7 @@ function traverseTableReferenceList(tableReferenceList, traverseContext, current
                     traverseExpr(onClause, Object.assign(Object.assign({}, traverseContext), { fromColumns: allJoinedColumns.flatMap(c => c).concat(result) }));
                     const columns = (0, select_columns_1.getExpressions)(onClause, ts_mysql_parser_1.SimpleExprColumnRefContext);
                     columns.forEach(columnRef => {
-                        const fieldName = (0, select_columns_1.splitName)(columnRef.text);
+                        const fieldName = (0, select_columns_1.splitName)(columnRef.expr.text);
                         if ((innerJoinFragment === null || innerJoinFragment === void 0 ? void 0 : innerJoinFragment.relation) != fieldName.prefix) {
                             innerJoinFragment.parentRelation = fieldName.prefix;
                         }
@@ -549,7 +562,7 @@ function traverseTableReferenceList(tableReferenceList, traverseContext, current
             });
         });
     });
-    if (!subQuery) {
+    if (!traverseContext.subQuery) {
         traverseContext.dynamicSqlInfo.from = fragements;
     }
     return result;
@@ -558,7 +571,7 @@ function traverseTableFactor(tableFactor, traverseContext, currentFragment) {
     var _a;
     const singleTable = tableFactor.singleTable();
     if (singleTable) {
-        return traverseSingleTable(singleTable, traverseContext.dbSchema, traverseContext.withSchema, currentFragment);
+        return traverseSingleTable(singleTable, traverseContext.dbSchema, traverseContext.withSchema, currentFragment, traverseContext.dynamicSqlInfo.with);
     }
     const derivadTable = tableFactor.derivedTable();
     if (derivadTable) {
@@ -602,7 +615,7 @@ function traverseTableReferenceListParens(ctx, traverseContext) {
     }
     throw Error('traverseTableReferenceListParens - not supported: ' + ctx.constructor.name);
 }
-function traverseSingleTable(singleTable, dbSchema, withSchema, currentFragment) {
+function traverseSingleTable(singleTable, dbSchema, withSchema, currentFragment, withFragments) {
     var _a;
     const table = singleTable === null || singleTable === void 0 ? void 0 : singleTable.tableRef().text;
     const tableAlias = (_a = singleTable === null || singleTable === void 0 ? void 0 : singleTable.tableAlias()) === null || _a === void 0 ? void 0 : _a.identifier().text;
@@ -610,6 +623,11 @@ 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) {
+            withFragment.parentRelation = tableAlias || tableName.name;
+        }
+    });
     const fields = filterColumns(dbSchema, withSchema, tableAlias, tableName);
     return fields;
 }
@@ -617,7 +635,7 @@ function traverseSubquery(subQuery, traverseContext, recursiveNames) {
     const queryExpressionParens = subQuery.queryExpressionParens();
     const queryExpression = queryExpressionParens.queryExpression();
     if (queryExpression) {
-        return traverseQueryExpression(queryExpression, traverseContext, true, recursiveNames);
+        return traverseQueryExpression(queryExpression, Object.assign(Object.assign({}, traverseContext), { subQuery: true }), recursiveNames);
     }
     const queryExpressionParens2 = queryExpressionParens.queryExpressionParens();
     if (queryExpressionParens2) {
@@ -625,7 +643,7 @@ function traverseSubquery(subQuery, traverseContext, recursiveNames) {
     }
     throw Error('traverseSubquery - not expected: ' + subQuery.constructor.name);
 }
-function traverseSelectItemList(selectItemList, traverseContext, subQuery = false) {
+function traverseSelectItemList(selectItemList, traverseContext) {
     const listType = [];
     if (selectItemList.MULT_OPERATOR()) {
         traverseContext.fromColumns.forEach(col => {
@@ -643,9 +661,9 @@ function traverseSelectItemList(selectItemList, traverseContext, subQuery = fals
                 dependOnFields: [],
                 dependOnParams: [],
                 parameters: [],
-                dependOn: []
+                dependOn: [tableName]
             };
-            if (!subQuery) {
+            if (!traverseContext.subQuery) {
                 traverseContext.dynamicSqlInfo.select.push(fieldFragment);
             }
         });
@@ -665,7 +683,6 @@ function traverseSelectItemList(selectItemList, traverseContext, subQuery = fals
         }
         const expr = selectItem.expr();
         if (expr) {
-            const exprType = traverseExpr(expr, traverseContext);
             const selectFragment = {
                 fragment: (0, select_columns_1.extractOriginalSql)(selectItem) + '',
                 fragementWithoutAlias: (0, select_columns_1.extractOriginalSql)(expr),
@@ -675,20 +692,9 @@ function traverseSelectItemList(selectItemList, traverseContext, subQuery = fals
                 parameters: [],
                 dependOn: []
             };
-            if (!subQuery) {
+            const exprType = traverseExpr(expr, Object.assign(Object.assign({}, traverseContext), { currentFragement: traverseContext.subQuery ? traverseContext.currentFragement : selectFragment }));
+            if (!traverseContext.subQuery) {
                 (_a = traverseContext.dynamicSqlInfo.select) === null || _a === void 0 ? void 0 : _a.push(selectFragment);
-                const columns = (0, select_columns_1.getExpressions)(expr, ts_mysql_parser_1.SimpleExprColumnRefContext);
-                const columnName = (0, select_columns_1.getColumnName)(selectItem);
-                columns.forEach(colRef => {
-                    const fieldName = (0, select_columns_1.splitName)(colRef.text);
-                    const column = (0, select_columns_1.findColumn)(fieldName, traverseContext.fromColumns);
-                    selectFragment.fields.push({
-                        field: fieldName.name,
-                        name: columnName,
-                        table: column.tableAlias || column.table
-                    });
-                    selectFragment.dependOn.push(column.tableAlias || column.table);
-                });
             }
             // const fields = exprType.kind == 'TypeVar' ? [{ field: exprType.name, table: exprType.table + '', name: getColumnName(selectItem) }] : []
             if (exprType.kind == 'TypeOperator') {
@@ -712,12 +718,12 @@ function traverseHavingClause(havingClause, traverseContext) {
     const havingExpr = havingClause.expr();
     traverseExpr(havingExpr, traverseContext);
 }
-function traverseExpr(expr, traverseContext, where = false) {
+function traverseExpr(expr, traverseContext) {
     if (expr instanceof ts_mysql_parser_1.ExprIsContext) {
         const boolPri = expr.boolPri();
         let paramsCount = traverseContext.parameters.length;
-        const boolPriType = traverseBoolPri(boolPri, traverseContext, where);
-        if (where) {
+        const boolPriType = traverseBoolPri(boolPri, traverseContext);
+        if (traverseContext.where) {
             const currentFragment = {
                 fragment: 'AND ' + (0, select_columns_1.extractOriginalSql)(expr),
                 fields: [],
@@ -733,7 +739,7 @@ function traverseExpr(expr, traverseContext, where = false) {
             });
             const columnsRef = (0, select_columns_1.getExpressions)(expr, ts_mysql_parser_1.ColumnRefContext);
             columnsRef.forEach(colRef => {
-                const fileName = (0, select_columns_1.splitName)(colRef.text);
+                const fileName = (0, select_columns_1.splitName)(colRef.expr.text);
                 currentFragment.fields.push({
                     field: fileName.name,
                     name: fileName.name,
@@ -757,8 +763,8 @@ function traverseExpr(expr, traverseContext, where = false) {
         (0, select_columns_1.getTopLevelAndExpr)(expr, all);
         all.forEach(andExpression => {
             let paramsCount = traverseContext.parameters.length;
-            traverseExpr(andExpression.expr, traverseContext, false);
-            if (where) {
+            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),
                     fields: [],
@@ -774,7 +780,7 @@ function traverseExpr(expr, traverseContext, where = false) {
                 });
                 const columnsRef = (0, select_columns_1.getExpressions)(andExpression.expr, ts_mysql_parser_1.ColumnRefContext);
                 columnsRef.forEach(colRef => {
-                    const fileName = (0, select_columns_1.splitName)(colRef.text);
+                    const fileName = (0, select_columns_1.splitName)(colRef.expr.text);
                     currentFragment.fields.push({
                         field: fileName.name,
                         name: fileName.name,
@@ -788,10 +794,10 @@ function traverseExpr(expr, traverseContext, where = false) {
     }
     throw Error('traverseExpr - not supported: ' + expr.text);
 }
-function traverseBoolPri(boolPri, traverseContext, where = false) {
+function traverseBoolPri(boolPri, traverseContext) {
     if (boolPri instanceof ts_mysql_parser_1.PrimaryExprPredicateContext) {
         const predicate = boolPri.predicate();
-        const predicateType = traversePredicate(predicate, traverseContext, where);
+        const predicateType = traversePredicate(predicate, traverseContext);
         return predicateType;
     }
     if (boolPri instanceof ts_mysql_parser_1.PrimaryExprIsNullContext) {
@@ -829,9 +835,9 @@ function traverseBoolPri(boolPri, traverseContext, where = false) {
     }
     throw Error('traverseExpr - not supported: ' + boolPri.constructor.name);
 }
-function traversePredicate(predicate, traverseContext, where = false) {
+function traversePredicate(predicate, traverseContext) {
     const bitExpr = predicate.bitExpr()[0]; //TODO - predicate length = 2? [1] == predicateOperations
-    const bitExprType = traverseBitExpr(bitExpr, traverseContext, where);
+    const bitExprType = traverseBitExpr(bitExpr, traverseContext);
     const predicateOperations = predicate.predicateOperations();
     if (predicateOperations) {
         const rightType = traversePredicateOperations(predicateOperations, bitExprType, traverseContext);
@@ -871,10 +877,10 @@ function traverseExprList(exprList, traverseContext) {
     };
     return type;
 }
-function traverseBitExpr(bitExpr, traverseContext, where = false) {
+function traverseBitExpr(bitExpr, traverseContext) {
     const simpleExpr = bitExpr.simpleExpr();
     if (simpleExpr) {
-        return traverseSimpleExpr(simpleExpr, traverseContext, where);
+        return traverseSimpleExpr(simpleExpr, Object.assign(Object.assign({}, traverseContext), { where: false }));
     }
     if (bitExpr.bitExpr().length == 2) {
         const bitExprLeft = bitExpr.bitExpr()[0];
@@ -959,13 +965,13 @@ function traversePredicateOperations(predicateOperations, parentType, traverseCo
         }
         const exprList = predicateOperations.exprList();
         if (exprList) {
-            const rightType = traverseExprList(exprList, traverseContext);
+            const rightType = traverseExprList(exprList, Object.assign(Object.assign({}, traverseContext), { where: false }));
             return rightType;
         }
     }
     if (predicateOperations instanceof ts_mysql_parser_1.PredicateExprLikeContext) {
         const simpleExpr = predicateOperations.simpleExpr()[0];
-        const rightType = traverseSimpleExpr(simpleExpr, traverseContext);
+        const rightType = traverseSimpleExpr(simpleExpr, Object.assign(Object.assign({}, traverseContext), { where: false }));
         traverseContext.constraints.push({
             expression: simpleExpr.text,
             type1: parentType,
@@ -997,7 +1003,7 @@ function traversePredicateOperations(predicateOperations, parentType, traverseCo
     }
     throw Error("Not supported: " + predicateOperations.constructor.name);
 }
-function traverseSimpleExpr(simpleExpr, traverseContext, where = false) {
+function traverseSimpleExpr(simpleExpr, traverseContext) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprColumnRefContext) {
         const fieldName = (0, select_columns_1.splitName)(simpleExpr.text);
@@ -1009,6 +1015,17 @@ function traverseSimpleExpr(simpleExpr, traverseContext, where = false) {
             type2: column.columnType,
             mostGeneralType: true
         });
+        if (traverseContext.currentFragement != null) {
+            if (!traverseContext.subQuery) {
+                traverseContext.currentFragement.dependOn.push(column.tableAlias || column.table);
+            }
+            else {
+                const subQueryColumn = (0, select_columns_1.findColumnOrNull)(fieldName, traverseContext.subQueryColumns);
+                if (subQueryColumn == null) {
+                    traverseContext.currentFragement.dependOn.push(column.tableAlias || column.table);
+                }
+            }
+        }
         return typeVar;
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprParamMarkerContext) {
@@ -1054,7 +1071,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext, where = false) {
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprListContext) {
         const exprList = simpleExpr.exprList();
         const listType = exprList.expr().map(item => {
-            const exprType = traverseExpr(item, traverseContext, false);
+            const exprType = traverseExpr(item, Object.assign(Object.assign({}, traverseContext), { where: false }));
             return exprType;
         });
         const resultType = {