typesql-cli 0.18.6 → 0.19.1

package/postgres-query-analyzer/traverse.js

@@ -233,7 +233,7 @@ function traverse_simple_select_pramary(simple_select_pramary, context, traverse
     }
     const where_a_expr = (_a = simple_select_pramary.where_clause()) === null || _a === void 0 ? void 0 : _a.a_expr();
     //fromColumns has precedence
-    //context.fromColumns only becase of insert. update
+    //context.fromColumns because of exists(... where), join lateral(... where).
     const newContext = Object.assign(Object.assign({}, context), { fromColumns: [...context.fromColumns, ...fromResult.columns, ...context.parentColumns] });
     if (where_a_expr) {
         const numParamsBefore = traverseResult.parameters.length;
@@ -262,7 +262,7 @@ function traverse_simple_select_pramary(simple_select_pramary, context, traverse
     if (having_expr) {
         traverse_a_expr(having_expr, newContext, traverseResult);
     }
-    const filteredColumns = filterColumns_simple_select_pramary(simple_select_pramary, Object.assign(Object.assign({}, context), { fromColumns: context.fromColumns.concat(fromResult.columns) }), traverseResult);
+    const filteredColumns = filterColumns_simple_select_pramary(simple_select_pramary, Object.assign(Object.assign({}, context), { fromColumns: fromResult.columns, parentColumns: context.fromColumns }), traverseResult);
     return {
         columns: filteredColumns,
         singleRow: fromResult.singleRow
@@ -273,7 +273,7 @@ function extractRelations(a_expr) {
     const relations = columnsRef
         .map((colRefExpr) => {
         const colRef = colRefExpr;
-        const tableName = (0, select_columns_1.splitName)(colRef.getText());
+        const tableName = getFieldName(colRef);
         return tableName;
     });
     const uniqueRelations = [...new Set(relations.map(relation => relation.prefix))];
@@ -338,7 +338,7 @@ function traverse_target_list(target_list, context, traverseResult) {
         }
         const column = traverse_target_el(target_el, context, traverseResult);
         if (isParameter(column.column_name)) {
-            traverseResult.parameters.at(-1).isNotNull = !context.fromColumns[index].is_nullable;
+            traverseResult.parameters.at(-1).isNotNull = !context.parentColumns[index].is_nullable;
         }
         return [column];
     });
@@ -351,7 +351,7 @@ function traverse_target_el(target_el, context, traverseResult) {
         const numParamsBefore = traverseResult.parameters.length;
         const exprResult = traverse_a_expr(a_expr, context, traverseResult);
         const colLabel = target_el.colLabel();
-        const alias = colLabel != null ? colLabel.getText() : '';
+        const alias = colLabel != null ? get_colid_text(colLabel) : '';
         if (alias) {
             (_a = traverseResult.relations) === null || _a === void 0 ? void 0 : _a.forEach(relation => {
                 if ((relation.name === exprResult.table_name || relation.alias === exprResult.table_name)
@@ -688,10 +688,16 @@ function traverse_expr_typecast(a_expr_typecast, context, traverseResult) {
     throw Error('traverse_expr_typecast -  Not expected:' + a_expr_typecast.getText());
 }
 function traverseColumnRef(columnref, fromColumns) {
-    const fieldName = (0, select_columns_1.splitName)(columnref.getText());
+    const fieldName = getFieldName(columnref);
     const col = findColumn(fieldName, fromColumns);
     return Object.assign(Object.assign({}, col), { is_nullable: col.is_nullable });
 }
+function getFieldName(columnref) {
+    const colid = get_colid_text(columnref.colid());
+    const indirection = columnref.indirection();
+    let fieldName = indirection ? { name: get_indiretion_text(indirection), prefix: colid } : { name: colid, prefix: '' };
+    return fieldName;
+}
 function getNameAndTypeIdFromAExprConst(a_expr_const) {
     var _a, _b;
     if (a_expr_const.iconst()) {
@@ -918,11 +924,7 @@ function filterColumns(fromColumns, fieldName) {
     });
 }
 function excludeColumns(fromColumns, excludeList) {
-    return fromColumns.filter(col => {
-        const found = excludeList.find(excluded => (excluded.prefix === '' || col.table_name === excluded.prefix)
-            && excluded.name == col.column_name);
-        return !found;
-    });
+    return fromColumns.filter(col => !excludeList.find(excluded => excluded == col.column_name));
 }
 function traversec_expr_case(c_expr_case, context, traverseResult) {
     var _a;
@@ -1425,12 +1427,14 @@ function traverse_table_ref(table_ref, context, traverseResult) {
     const relation_expr = table_ref.relation_expr();
     const aliasClause = table_ref.alias_clause();
     const alias = aliasClause ? aliasClause.colid().getText() : '';
+    let singleRow = false;
     if (relation_expr) {
         const tableName = traverse_relation_expr(relation_expr);
         const fromColumns = getFromColumns(tableName, context.fromColumns.concat(context.withColumns), context.dbSchema);
         const tableNameWithAlias = alias ? alias : tableName.name;
         const fromColumnsResult = fromColumns.map(col => (Object.assign(Object.assign({}, col), { table_name: tableNameWithAlias.toLowerCase() })));
         allColumns.push(...fromColumnsResult);
+        singleRow = false;
         if (context.collectNestedInfo) {
             const key = fromColumnsResult.filter(col => col.column_key === 'PRI');
             const renameAs = (aliasClause === null || aliasClause === void 0 ? void 0 : aliasClause.AS()) != null;
@@ -1448,41 +1452,64 @@ function traverse_table_ref(table_ref, context, traverseResult) {
         if (context.collectDynamicQueryInfo && traverseResult.dynamicQueryInfo.from.length == 0) {
             collectDynamicQueryInfoTableRef(table_ref, null, null, fromColumnsResult, [], traverseResult);
         }
+    }
+    else if (table_ref.LATERAL_P()) {
+        const newContext = Object.assign(Object.assign({}, context), { collectDynamicQueryInfo: false });
+        const lateralJoinResult = traverse_select_with_parens_or_func_table(table_ref, newContext, traverseResult);
+        allColumns.push(...lateralJoinResult.columns);
+        singleRow = false;
+    }
+    else if (table_ref.select_with_parens() || table_ref.func_table()) {
+        const select_with_parens_or_func_result = traverse_select_with_parens_or_func_table(table_ref, context, traverseResult);
+        allColumns.push(...select_with_parens_or_func_result.columns);
+        singleRow = select_with_parens_or_func_result.singleRow;
+    }
+    else if (table_ref.OPEN_PAREN()) {
+        const table_ref2 = table_ref.table_ref(0);
+        const joinList = extractJoins(table_ref2);
+        const joinColumns = traverse_joins(joinList, context, traverseResult);
+        const aliasClause = table_ref.alias_clause();
+        if (aliasClause) {
+            const alias = aliasClause.colid().getText();
+            joinColumns.forEach(col => col.table_name = alias.toLowerCase());
+        }
+        allColumns.push(...joinColumns);
+        singleRow = false;
+    }
+    const table_ref_list = table_ref.table_ref_list();
+    if (table_ref_list.length > 0) {
         const joinList = extractJoins(table_ref);
-        joinList.forEach((join, index) => {
-            const joinType = join.joinType; //INNER, LEFT
-            const joinQual = join.joinQual;
-            const numParamsBefore = traverseResult.parameters.length;
-            const subsequentJoints = joinList.slice(index + 1);
-            let joinColumns = [];
-            if (join.tableRef.LATERAL_P()) {
-                const newContext = Object.assign(Object.assign({}, context), { parentColumns: allColumns, collectDynamicQueryInfo: false });
-                const lateralJoinResult = traverse_select_with_parens_or_func_table(join.tableRef, newContext, traverseResult);
-                joinColumns = lateralJoinResult.columns;
-            }
-            else {
-                const joinTableRefResult = traverse_table_ref(join.tableRef, context, traverseResult);
-                joinColumns = (joinQual === null || joinQual === void 0 ? void 0 : joinQual.USING()) ? filterUsingColumns(joinTableRefResult.columns, joinQual) : joinTableRefResult.columns;
-            }
-            const nullableColumns = (joinType === null || joinType === void 0 ? void 0 : joinType.LEFT())
-                ? joinColumns.map(col => (Object.assign(Object.assign({}, col), { original_is_nullable: col.is_nullable, is_nullable: checkLeftJoinIsNullable(join, subsequentJoints, joinColumns) ? true : col.is_nullable })))
-                : joinColumns;
-            allColumns.push(...nullableColumns);
-            if (context.collectNestedInfo && joinQual) {
-                collectNestedInfo(joinQual, joinColumns, traverseResult);
-            }
-            if (context.collectDynamicQueryInfo) {
-                const parameters = traverseResult.parameters.slice(numParamsBefore).map((_, index) => index + numParamsBefore);
-                collectDynamicQueryInfoTableRef(join.tableRef, joinType, joinQual, joinColumns, parameters, traverseResult);
-            }
-        });
-        return {
-            columns: allColumns,
-            singleRow: false
-        };
+        const joinColumns = traverse_joins(joinList, Object.assign(Object.assign({}, context), { parentColumns: allColumns }), traverseResult);
+        allColumns.push(...joinColumns);
+        singleRow = false;
     }
-    const select_with_parens_or_func_result = traverse_select_with_parens_or_func_table(table_ref, context, traverseResult);
-    return select_with_parens_or_func_result;
+    return {
+        columns: allColumns,
+        singleRow
+    };
+}
+function traverse_joins(joinList, context, traverseResult) {
+    const allColumns = [];
+    joinList.forEach((join, index) => {
+        const joinType = join.joinType; //INNER, LEFT
+        const joinQual = join.joinQual;
+        const numParamsBefore = traverseResult.parameters.length;
+        const subsequentJoints = joinList.slice(index + 1);
+        const joinTableRefResult = traverse_table_ref(join.tableRef, Object.assign(Object.assign({}, context), { fromColumns: context.fromColumns.concat(allColumns) }), traverseResult);
+        const joinColumns = (joinQual === null || joinQual === void 0 ? void 0 : joinQual.USING()) ? filterUsingColumns(joinTableRefResult.columns, joinQual) : joinTableRefResult.columns;
+        const nullableColumns = (joinType === null || joinType === void 0 ? void 0 : joinType.LEFT())
+            ? joinColumns.map(col => (Object.assign(Object.assign({}, col), { original_is_nullable: col.is_nullable, is_nullable: checkLeftJoinIsNullable(join, subsequentJoints, joinColumns) ? true : col.is_nullable })))
+            : joinColumns;
+        allColumns.push(...nullableColumns);
+        if (context.collectNestedInfo && joinQual) {
+            collectNestedInfo(joinQual, joinColumns, traverseResult);
+        }
+        if (context.collectDynamicQueryInfo) {
+            const parameters = traverseResult.parameters.slice(numParamsBefore).map((_, index) => index + numParamsBefore);
+            collectDynamicQueryInfoTableRef(join.tableRef, joinType, joinQual, joinColumns, parameters, traverseResult);
+        }
+    });
+    return allColumns;
 }
 function traverse_select_with_parens_or_func_table(tableRef, context, traverseResult) {
     var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -1556,7 +1583,7 @@ function getJoinColumns(joinQual) {
         const a_expr_or = a_expr_or_list[0];
         const a_expr_and = a_expr_or.a_expr_and_list()[0];
         const columnref = collectContextsOfType(a_expr_and, PostgreSQLParser_1.ColumnrefContext);
-        const joinColumns = columnref.map(colRef => (0, select_columns_1.splitName)(colRef.getText()));
+        const joinColumns = columnref.map(colRef => getFieldName(colRef));
         return joinColumns;
     }
     return [];
@@ -1584,7 +1611,7 @@ function collectNestedInfo(joinQual, resultColumns, traverseResult) {
     });
 }
 function filterUsingColumns(fromColumns, joinQual) {
-    const excludeList = joinQual.name_list().name_list().map(name => (0, select_columns_1.splitName)(name.getText()));
+    const excludeList = joinQual.name_list().name_list().map(name => get_colid_text(name.colid()));
     const filteredColumns = excludeColumns(fromColumns, excludeList);
     return filteredColumns;
 }
@@ -1677,12 +1704,12 @@ function traverse_relation_expr(relation_expr) {
     return name;
 }
 function traverse_qualified_name(qualified_name) {
-    var _a, _b;
     const colid_name = qualified_name.colid() ? get_colid_text(qualified_name.colid()) : '';
-    const indirection_el_list = (_a = qualified_name.indirection()) === null || _a === void 0 ? void 0 : _a.indirection_el_list();
-    if (indirection_el_list && indirection_el_list.length === 1) {
+    const indirection = qualified_name.indirection();
+    if (indirection) {
+        const indirection_text = get_indiretion_text(indirection);
         return {
-            name: ((_b = indirection_el_list[0].attr_name()) === null || _b === void 0 ? void 0 : _b.getText()) || '',
+            name: indirection_text,
             alias: colid_name
         };
     }
@@ -1694,7 +1721,7 @@ function traverse_qualified_name(qualified_name) {
 function get_colid_text(colid) {
     const identifier = colid.identifier();
     if (identifier) {
-        return traverse_identifier(identifier);
+        return get_identifier_text(identifier);
     }
     const unreserved_keyword = colid.unreserved_keyword();
     if (unreserved_keyword) {
@@ -1702,8 +1729,24 @@ function get_colid_text(colid) {
     }
     return '';
 }
-function traverse_identifier(identifier) {
-    const tableName = identifier.Identifier().getText();
+function get_indiretion_text(indirection) {
+    var _a;
+    const indirection_el_list = indirection.indirection_el_list();
+    if (indirection_el_list && indirection_el_list.length === 1) {
+        const colLabel = (_a = indirection_el_list[0].attr_name()) === null || _a === void 0 ? void 0 : _a.colLabel();
+        if (colLabel) {
+            return get_colid_text(colLabel);
+        }
+    }
+    return '';
+}
+function get_identifier_text(identifier) {
+    const quoted_identifier = identifier.QuotedIdentifier();
+    if (quoted_identifier) {
+        const tableName = quoted_identifier.getText().slice(1, -1);
+        return tableName;
+    }
+    const tableName = identifier.getText();
     return tableName;
 }
 function traverse_unreserved_keyword(unreserved_keyword) {
@@ -2080,7 +2123,7 @@ function isNotNull_c_expr(c_expr, field) {
     if (c_expr instanceof PostgreSQLParser_1.C_expr_exprContext) {
         const columnref = c_expr.columnref();
         if (columnref) {
-            const fieldName = (0, select_columns_1.splitName)(columnref.getText());
+            const fieldName = getFieldName(columnref);
             return (fieldName.name === field.name && (fieldName.prefix === '' || field.prefix === fieldName.prefix));
         }
         const aexprconst = c_expr.aexprconst();
@@ -2378,8 +2421,7 @@ function getCheckedUniqueColumn(a_expr_like) {
     if (c_expr instanceof PostgreSQLParser_1.C_expr_exprContext) {
         const columnref = c_expr.columnref();
         if (columnref) {
-            const fieldName = (0, select_columns_1.splitName)(columnref.getText());
-            // const col = traverseColumnRef(columnref, dbSchema);
+            const fieldName = getFieldName(columnref);
             return fieldName.name;
         }
     }