typesql-cli 0.19.2 → 0.21.0

package/postgres-query-analyzer/traverse.js

@@ -8,6 +8,7 @@ const typesql_parser_1 = require("@wsporto/typesql-parser");
 const select_columns_1 = require("../mysql-query-analyzer/select-columns");
 const postgres_1 = require("@wsporto/typesql-parser/postgres");
 const case_nullability_checker_1 = require("./case-nullability-checker");
+const util_1 = require("./util");
 function defaultOptions() {
     return {
         collectNestedInfo: false,
@@ -89,7 +90,7 @@ function traverseSelectstmt(selectstmt, context, traverseResult) {
     const paramIsListResult = getInParameterList(selectstmt);
     const selectResult = traverse_selectstmt(selectstmt, context, traverseResult);
     //select parameters are collected after from paramters
-    traverseResult.parameters.sort((param1, param2) => param1.paramIndex - param2.paramIndex);
+    traverseResult.parameters.sort((param1, param2) => param1.paramPos - param2.paramPos);
     const multipleRowsResult = !(selectResult.singleRow || isSingleRowResult(selectstmt, selectResult.columns));
     const limit = checkLimit(selectstmt);
     const postgresTraverseResult = {
@@ -98,8 +99,12 @@ function traverseSelectstmt(selectstmt, context, traverseResult) {
         columns: selectResult.columns,
         parametersNullability: traverseResult.parameters.map(param => (Object.assign({ isNotNull: param.isNotNull }, addConstraintIfNotNull(param.checkConstraint)))),
         parameterList: paramIsListResult,
+        orderByColumns: selectResult.orderByColumns,
         limit
     };
+    if (selectResult.orderByColumns && selectResult.orderByColumns.length > 0) {
+        postgresTraverseResult.orderByColumns = selectResult.orderByColumns;
+    }
     if (traverseResult.relations) {
         postgresTraverseResult.relations = traverseResult.relations;
     }
@@ -120,7 +125,7 @@ function traverse_selectstmt(selectstmt, context, traverseResult) {
     };
 }
 function traverse_select_no_parens(select_no_parens, context, traverseResult) {
-    var _a;
+    var _a, _b;
     const with_clause = select_no_parens.with_clause();
     if (with_clause) {
         with_clause.cte_list().common_table_expr_list()
@@ -135,13 +140,22 @@ function traverse_select_no_parens(select_no_parens, context, traverseResult) {
     }
     const select_clause = select_no_parens.select_clause();
     const selectResult = traverse_select_clause(select_clause, context, traverseResult);
+    const sort_clause = (_a = select_no_parens.sort_clause_()) === null || _a === void 0 ? void 0 : _a.sort_clause();
+    if (sort_clause) {
+        context.ignoreColumnRef = true;
+        sort_clause.sortby_list().sortby_list().forEach(sortby => {
+            const a_expr = sortby.a_expr();
+            traverse_a_expr(a_expr, context, traverseResult);
+        });
+        context.ignoreColumnRef = undefined;
+    }
     const select_limit = select_no_parens.select_limit();
     if (select_limit) {
         const numParamsBefore = traverseResult.parameters.length;
         let fragment = '';
         const limit_clause = select_limit.limit_clause();
         if (limit_clause) {
-            const limit_a_expr = (_a = limit_clause.select_limit_value()) === null || _a === void 0 ? void 0 : _a.a_expr();
+            const limit_a_expr = (_b = limit_clause.select_limit_value()) === null || _b === void 0 ? void 0 : _b.a_expr();
             if (limit_a_expr) {
                 traverse_a_expr(limit_a_expr, context, traverseResult);
             }
@@ -158,7 +172,7 @@ function traverse_select_no_parens(select_no_parens, context, traverseResult) {
             }
         }
         if (fragment) {
-            const parameters = traverseResult.parameters.slice(numParamsBefore).map((_, index) => index + numParamsBefore);
+            const parameters = getParametersIndexes(traverseResult.parameters.slice(numParamsBefore));
             traverseResult.dynamicQueryInfo.limitOffset = {
                 fragment,
                 parameters
@@ -175,7 +189,7 @@ function traverse_common_table_expr(common_table_expr, context, traverseResult)
     const selectResult = traverse_selectstmt(select_stmt, Object.assign(Object.assign({}, context), { collectDynamicQueryInfo: false }), traverseResult);
     const columnsWithTalbeName = selectResult.columns.map(col => (Object.assign(Object.assign({}, col), { table: tableName })));
     if (context.collectDynamicQueryInfo) {
-        const parameters = traverseResult.parameters.slice(numParamsBefore).map((_, index) => index + numParamsBefore);
+        const parameters = getParametersIndexes(traverseResult.parameters.slice(numParamsBefore));
         (_a = traverseResult.dynamicQueryInfo) === null || _a === void 0 ? void 0 : _a.with.push({
             fragment: (0, select_columns_1.extractOriginalSql)(common_table_expr),
             relationName: tableName,
@@ -184,6 +198,10 @@ function traverse_common_table_expr(common_table_expr, context, traverseResult)
     }
     return columnsWithTalbeName;
 }
+function getParametersIndexes(params) {
+    const parameters = [...new Set(params.map(param => param.parameterNumber - 1))];
+    return parameters;
+}
 function traverse_select_clause(select_clause, context, traverseResult) {
     const simple_select_intersect_list = select_clause.simple_select_intersect_list();
     const mainSelectResult = traverse_simple_select_intersect(simple_select_intersect_list[0], context, traverseResult);
@@ -201,6 +219,7 @@ function traverse_select_clause(select_clause, context, traverseResult) {
     }
     return {
         columns,
+        orderByColumns: mainSelectResult.orderByColumns,
         singleRow: simple_select_intersect_list.length == 1 ? mainSelectResult.singleRow : false
     };
 }
@@ -224,7 +243,7 @@ function traverse_simple_select_pramary(simple_select_pramary, context, traverse
     if (from_clause) {
         const where_clause = simple_select_pramary.where_clause();
         fromResult = traverse_from_clause(from_clause, context, traverseResult);
-        fromResult.columns = where_clause != null ? fromResult.columns.map(field => checkIsNullable(where_clause, field)) : fromResult.columns;
+        fromResult.columns = where_clause != null ? fromResult.columns.map(field => (Object.assign(Object.assign({}, field), { is_nullable: !checkIsNotNull(where_clause, field, fromResult.columns) }))) : fromResult.columns;
     }
     const values_clause = simple_select_pramary.values_clause();
     if (values_clause) {
@@ -242,10 +261,10 @@ function traverse_simple_select_pramary(simple_select_pramary, context, traverse
         const numParamsBefore = traverseResult.parameters.length;
         traverse_a_expr(where_a_expr, newContext, traverseResult);
         if (context.collectDynamicQueryInfo) {
-            const parameters = traverseResult.parameters.slice(numParamsBefore).map((_, index) => index + numParamsBefore);
+            const parameters = getParametersIndexes(traverseResult.parameters.slice(numParamsBefore));
             const relations = extractRelations(where_a_expr);
             (_b = traverseResult.dynamicQueryInfo) === null || _b === void 0 ? void 0 : _b.where.push({
-                fragment: `AND ${(0, select_columns_1.extractOriginalSql)(where_a_expr)}`,
+                fragment: `${(0, select_columns_1.extractOriginalSql)(where_a_expr)}`,
                 parameters,
                 dependOnRelations: relations
             });
@@ -254,11 +273,11 @@ function traverse_simple_select_pramary(simple_select_pramary, context, traverse
     (_d = (_c = simple_select_pramary.group_clause()) === null || _c === void 0 ? void 0 : _c.group_by_list()) === null || _d === void 0 ? void 0 : _d.group_by_item_list().forEach(group_by => {
         const a_expr = group_by.a_expr();
         if (a_expr) {
-            newContext.groupBy = true;
+            newContext.ignoreColumnRef = true;
             /* The GROUP BY clause can reference column aliases defined in the SELECT list.
             There's no need to retrieve nullability or type information from the GROUP BY expressions (findColumn(col). */
             traverse_a_expr(a_expr, newContext, traverseResult);
-            newContext.groupBy = false;
+            newContext.ignoreColumnRef = false;
         }
     });
     const having_expr = (_e = simple_select_pramary.having_clause()) === null || _e === void 0 ? void 0 : _e.a_expr();
@@ -266,9 +285,11 @@ function traverse_simple_select_pramary(simple_select_pramary, context, traverse
         traverse_a_expr(having_expr, newContext, traverseResult);
     }
     const filteredColumns = filterColumns_simple_select_pramary(simple_select_pramary, Object.assign(Object.assign({}, context), { fromColumns: fromResult.columns, parentColumns: context.fromColumns }), traverseResult);
+    const orderByColumns = (0, util_1.getOrderByColumns)(fromResult.columns, filteredColumns);
     return {
         columns: filteredColumns,
-        singleRow: fromResult.singleRow
+        singleRow: fromResult.singleRow,
+        orderByColumns
     };
 }
 function extractRelations(a_expr) {
@@ -364,7 +385,7 @@ function traverse_target_el(target_el, context, traverseResult) {
             });
         }
         if (context.collectDynamicQueryInfo) {
-            const parameters = traverseResult.parameters.slice(numParamsBefore).map((_, index) => index + numParamsBefore);
+            const parameters = getParametersIndexes(traverseResult.parameters.slice(numParamsBefore));
             const relations = extractRelations(target_el.a_expr());
             (_b = traverseResult.dynamicQueryInfo) === null || _b === void 0 ? void 0 : _b.select.push({
                 fragment: (0, select_columns_1.extractOriginalSql)(target_el),
@@ -692,8 +713,15 @@ function traverse_expr_typecast(a_expr_typecast, context, traverseResult) {
 }
 function traverseColumnRef(columnref, fromColumns) {
     const fieldName = getFieldName(columnref);
-    const col = findColumn(fieldName, fromColumns);
-    return Object.assign(Object.assign({}, col), { is_nullable: col.is_nullable });
+    const col = findColumnOrNull(fieldName, fromColumns);
+    if (col != null) {
+        return Object.assign(Object.assign({}, col), { is_nullable: col.is_nullable });
+    }
+    const record = findRecordOrNull(fieldName, fromColumns);
+    if (record != null) {
+        return record;
+    }
+    throw Error('Column not found: ' + fieldNameToString(fieldName));
 }
 function getFieldName(columnref) {
     const colid = get_colid_text(columnref.colid());
@@ -781,7 +809,7 @@ function traversec_expr(c_expr, context, traverseResult) {
         }
         const columnref = c_expr.columnref();
         if (columnref) {
-            if (context.groupBy) {
+            if (context.ignoreColumnRef) {
                 return {
                     column_name: columnref.getText(),
                     is_nullable: false,
@@ -821,8 +849,9 @@ function traversec_expr(c_expr, context, traverseResult) {
         }
         if (c_expr.PARAM()) {
             traverseResult.parameters.push({
-                paramIndex: c_expr.start.start,
-                isNotNull: !context.propagatesNull
+                paramPos: c_expr.start.start,
+                isNotNull: !context.propagatesNull,
+                parameterNumber: Number(c_expr.PARAM().getText().slice(1)) //$1, $2...
             });
             return {
                 column_name: c_expr.PARAM().getText(),
@@ -941,7 +970,7 @@ function traversec_expr_case(c_expr_case, context, traverseResult) {
     const elseIsNotNull = (elseResult === null || elseResult === void 0 ? void 0 : elseResult.is_nullable) === false || branchNotNull;
     const notNull = elseIsNotNull && whenIsNotNull;
     return {
-        column_name: '?column?',
+        column_name: 'case',
         is_nullable: !notNull,
         table: '',
         schema: '',
@@ -1361,13 +1390,35 @@ function findColumnOrNull(fieldName, fromColumns) {
     const col = fromColumns.find(col => (fieldName.prefix === '' || col.table.toLowerCase() === fieldName.prefix.toLowerCase()) && col.column_name.toLowerCase() === fieldName.name.toLowerCase());
     return col;
 }
+function findRecordOrNull(fieldName, fromColumns) {
+    const table = fromColumns.filter(col => col.table.toLowerCase() === fieldName.name.toLowerCase()
+        || fieldName.name === '*' && col.table === fieldName.prefix);
+    if (table.length === 0) {
+        return null;
+    }
+    return Object.assign(Object.assign({}, table[0]), { recordTypes: table });
+}
 function fieldNameToString(fieldName) {
     return fieldName.prefix !== '' ? `${fieldName.prefix}.${fieldName.name}` : fieldName.name;
 }
-function checkIsNullable(where_clause, field) {
-    const isNotNullResult = !field.is_nullable || isNotNull({ name: field.column_name, prefix: field.table }, where_clause);
-    const col = Object.assign(Object.assign({}, field), { is_nullable: !isNotNullResult });
-    return col;
+function checkIsNotNull(where_clause, field, fromColumns) {
+    if (!field.is_nullable) {
+        return true;
+    }
+    const fieldName = { name: field.column_name, prefix: field.table };
+    const isNotNullExpr = isNotNull(fieldName, where_clause);
+    if (!isNotNullExpr) {
+        return false; //notNull: true
+    }
+    const col = findColumnOrNull(fieldName, fromColumns);
+    if (col != null) {
+        return true; //notNull: true
+    }
+    const record = findRecordOrNull({ name: fieldName.prefix, prefix: '' }, fromColumns);
+    if (record != null) {
+        return true; //notNull: true
+    }
+    return false;
 }
 function traverse_from_clause(from_clause, context, traverseResult) {
     const from_list = from_clause.from_list();
@@ -1381,11 +1432,17 @@ function traverse_from_clause(from_clause, context, traverseResult) {
     };
 }
 function traverse_from_list(from_list, context, traverseResult) {
-    const fromListResult = from_list.table_ref_list().map(table_ref => traverse_table_ref(table_ref, context, traverseResult));
-    const columns = fromListResult.flatMap(tableRes => tableRes.columns);
+    const tableRefs = from_list.table_ref_list();
+    const columns = [];
+    let singleRow = false;
+    for (const table_ref of tableRefs) {
+        const result = traverse_table_ref(table_ref, Object.assign(Object.assign({}, context), { parentColumns: columns }), traverseResult);
+        columns.push(...result.columns);
+        singleRow = result.singleRow;
+    }
     return {
         columns: columns,
-        singleRow: fromListResult.length === 1 ? fromListResult[0].singleRow : false
+        singleRow: tableRefs.length === 1 ? singleRow : false
     };
 }
 function getFromColumns(tableName, withColumns, dbSchema) {
@@ -1508,7 +1565,7 @@ function traverse_joins(joinList, context, traverseResult) {
             collectNestedInfo(joinQual, joinColumns, traverseResult);
         }
         if (context.collectDynamicQueryInfo) {
-            const parameters = traverseResult.parameters.slice(numParamsBefore).map((_, index) => index + numParamsBefore);
+            const parameters = getParametersIndexes(traverseResult.parameters.slice(numParamsBefore));
             collectDynamicQueryInfoTableRef(join.tableRef, joinType, joinQual, joinColumns, parameters, traverseResult);
         }
     });
@@ -1781,6 +1838,9 @@ function get_indiretion_text(indirection) {
         if (colLabel) {
             return get_colid_text(colLabel);
         }
+        if (indirection_el_list[0].STAR()) {
+            return '*';
+        }
     }
     return '';
 }
@@ -2033,7 +2093,7 @@ function isNotNull_a_expr_in(a_expr_in, field) {
 }
 function isNotNull_a_expr_unary_not(a_expr_unary_not, field) {
     const a_expr_isnull = a_expr_unary_not.a_expr_isnull();
-    if (a_expr_isnull) {
+    if (!a_expr_unary_not.NOT() && a_expr_isnull) {
         return isNotNull_a_expr_isnull(a_expr_isnull, field);
     }
     return false;
@@ -2172,7 +2232,9 @@ function isNotNull_c_expr(c_expr, field) {
         const columnref = c_expr.columnref();
         if (columnref) {
             const fieldName = getFieldName(columnref);
-            return (fieldName.name === field.name && (fieldName.prefix === '' || field.prefix === fieldName.prefix));
+            const fieldIsNotNull = (fieldName.name === field.name && (fieldName.prefix === '' || field.prefix === fieldName.prefix));
+            const tableIsNotNull = (fieldName.name === '*' && fieldName.prefix === field.prefix) || fieldName.name === field.prefix;
+            return fieldIsNotNull || tableIsNotNull;
         }
         const aexprconst = c_expr.aexprconst();
         if (aexprconst) {