typesql-cli 0.18.5 → 0.19.0

package/postgres-query-analyzer/traverse.js

@@ -124,8 +124,12 @@ function traverse_select_no_parens(select_no_parens, context, traverseResult) {
     if (with_clause) {
         with_clause.cte_list().common_table_expr_list()
             .forEach(common_table_expr => {
-            const withResult = traverse_common_table_expr(common_table_expr, context, traverseResult);
-            context.withColumns.push(...withResult);
+            var _a, _b, _c;
+            const recursiveTableName = with_clause.RECURSIVE() ? common_table_expr.name().getText() : undefined;
+            const recursiveColumnNames = (_c = (_b = (_a = common_table_expr.name_list_()) === null || _a === void 0 ? void 0 : _a.name_list()) === null || _b === void 0 ? void 0 : _b.name_list()) === null || _c === void 0 ? void 0 : _c.map(name => name.getText());
+            const withResult = traverse_common_table_expr(common_table_expr, Object.assign(Object.assign({}, context), { recursiveTableName, recursiveColumnNames }), traverseResult);
+            const columns = recursiveColumnNames ? withResult.map((col, index) => { var _a; return (Object.assign(Object.assign({}, col), { column_name: (_a = recursiveColumnNames[index]) !== null && _a !== void 0 ? _a : col.column_name })); }) : withResult;
+            context.withColumns.push(...columns);
         });
     }
     const select_clause = select_no_parens.select_clause();
@@ -182,8 +186,11 @@ function traverse_select_clause(select_clause, context, traverseResult) {
     const mainSelectResult = traverse_simple_select_intersect(simple_select_intersect_list[0], context, traverseResult);
     let columns = mainSelectResult.columns;
     //union
+    const { recursiveTableName, recursiveColumnNames } = context;
+    const recursiveColumns = recursiveTableName ? mainSelectResult.columns
+        .map((col, index) => { var _a; return (Object.assign(Object.assign({}, col), { table_name: recursiveTableName, column_name: (_a = recursiveColumnNames === null || recursiveColumnNames === void 0 ? void 0 : recursiveColumnNames[index]) !== null && _a !== void 0 ? _a : col.column_name })); }) : [];
     for (let index = 1; index < simple_select_intersect_list.length; index++) {
-        const unionResult = traverse_simple_select_intersect(simple_select_intersect_list[index], context, traverseResult);
+        const unionResult = traverse_simple_select_intersect(simple_select_intersect_list[index], Object.assign(Object.assign({}, context), { fromColumns: context.fromColumns.concat(recursiveColumns) }), traverseResult);
         columns = columns.map((value, columnIndex) => {
             const col = Object.assign({ column_name: value.column_name, is_nullable: value.is_nullable || unionResult.columns[columnIndex].is_nullable, table_name: '', table_schema: '', type: value.type }, (value.column_default && { column_default: value.column_default }));
             return col;
@@ -244,14 +251,18 @@ 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;
+            /* 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;
         }
     });
     const having_expr = (_e = simple_select_pramary.having_clause()) === null || _e === void 0 ? void 0 : _e.a_expr();
     if (having_expr) {
         traverse_a_expr(having_expr, newContext, traverseResult);
     }
-    const filteredColumns = filterColumns_simple_select_pramary(simple_select_pramary, newContext, traverseResult);
+    const filteredColumns = filterColumns_simple_select_pramary(simple_select_pramary, Object.assign(Object.assign({}, context), { fromColumns: context.fromColumns.concat(fromResult.columns) }), traverseResult);
     return {
         columns: filteredColumns,
         singleRow: fromResult.singleRow
@@ -262,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))];
@@ -340,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)
@@ -677,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()) {
@@ -747,7 +764,7 @@ function traversec_expr(c_expr, context, traverseResult) {
                 traverse_select_with_parens(select_with_parens, context, traverseResult);
                 return {
                     column_name: '?column?',
-                    is_nullable: true,
+                    is_nullable: false, //empty array
                     table_schema: '',
                     table_name: '',
                     type: 'unknown'
@@ -761,6 +778,15 @@ function traversec_expr(c_expr, context, traverseResult) {
         }
         const columnref = c_expr.columnref();
         if (columnref) {
+            if (context.groupBy) {
+                return {
+                    column_name: columnref.getText(),
+                    is_nullable: false,
+                    table_name: '',
+                    table_schema: '',
+                    type: 'unknown'
+                };
+            }
             if (context.columnRefIsRecord) {
                 const table = (0, select_columns_1.splitTableName)(columnref.getText());
                 const columns = filterColumns(context.fromColumns, table);
@@ -898,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;
@@ -1400,18 +1422,16 @@ function checkLeftJoinIsNullable(leftJoin, subsequentJoins, fromColumns) {
     return true; // No INNER JOIN filtered it — remains nullable
 }
 function traverse_table_ref(table_ref, context, traverseResult) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b;
     const allColumns = [];
     const relation_expr = table_ref.relation_expr();
     const aliasClause = table_ref.alias_clause();
-    const aliasNameList = (_b = (_a = aliasClause === null || aliasClause === void 0 ? void 0 : aliasClause.name_list()) === null || _a === void 0 ? void 0 : _a.name_list()) === null || _b === void 0 ? void 0 : _b.map(name => name.getText());
     const alias = aliasClause ? aliasClause.colid().getText() : '';
     if (relation_expr) {
         const tableName = traverse_relation_expr(relation_expr);
-        const fromColumns = getFromColumns(tableName, context.withColumns, context.dbSchema);
+        const fromColumns = getFromColumns(tableName, context.fromColumns.concat(context.withColumns), context.dbSchema);
         const tableNameWithAlias = alias ? alias : tableName.name;
-        const columnsWithAlias = fromColumns.map(col => (Object.assign(Object.assign({}, col), { table_name: tableNameWithAlias.toLowerCase() })));
-        const fromColumnsResult = columnsWithAlias.concat(context.parentColumns);
+        const fromColumnsResult = fromColumns.map(col => (Object.assign(Object.assign({}, col), { table_name: tableNameWithAlias.toLowerCase() })));
         allColumns.push(...fromColumnsResult);
         if (context.collectNestedInfo) {
             const key = fromColumnsResult.filter(col => col.column_key === 'PRI');
@@ -1421,45 +1441,56 @@ function traverse_table_ref(table_ref, context, traverseResult) {
                 alias: alias,
                 renameAs,
                 parentRelation: '',
-                joinColumn: ((_c = key[0]) === null || _c === void 0 ? void 0 : _c.column_name) || '',
+                joinColumn: ((_a = key[0]) === null || _a === void 0 ? void 0 : _a.column_name) || '',
                 cardinality: 'one',
                 parentCardinality: 'one'
             };
-            (_d = traverseResult.relations) === null || _d === void 0 ? void 0 : _d.push(relation);
+            (_b = traverseResult.relations) === null || _b === void 0 ? void 0 : _b.push(relation);
         }
         if (context.collectDynamicQueryInfo && traverseResult.dynamicQueryInfo.from.length == 0) {
             collectDynamicQueryInfoTableRef(table_ref, null, null, fromColumnsResult, [], traverseResult);
         }
         const joinList = extractJoins(table_ref);
-        const joinColumns = joinList.flatMap((join, index) => {
+        joinList.forEach((join, index) => {
             const joinType = join.joinType; //INNER, LEFT
             const joinQual = join.joinQual;
             const numParamsBefore = traverseResult.parameters.length;
-            const parentColumns = join.tableRef.LATERAL_P() ? fromColumnsResult : [];
-            const joinTableRefResult = traverse_table_ref(join.tableRef, Object.assign(Object.assign({}, context), { parentColumns }), traverseResult);
-            const isLeftJoin = joinType === null || joinType === void 0 ? void 0 : joinType.LEFT();
-            const filteredColumns = joinQual && (joinQual === null || joinQual === void 0 ? void 0 : joinQual.USING()) ? filterUsingColumns(joinTableRefResult.columns, joinQual) : joinTableRefResult.columns;
             const subsequentJoints = joinList.slice(index + 1);
-            const checkIsNullable = isLeftJoin ? checkLeftJoinIsNullable(join, subsequentJoints, filteredColumns) : false;
-            ;
-            const resultColumns = isLeftJoin ? filteredColumns.map(col => {
-                const colResult = Object.assign(Object.assign({}, col), { is_nullable: checkIsNullable ? true : col.is_nullable, original_is_nullable: col.is_nullable });
-                return colResult;
-            }) : filteredColumns;
+            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, resultColumns, traverseResult);
+                collectNestedInfo(joinQual, joinColumns, traverseResult);
             }
             if (context.collectDynamicQueryInfo) {
                 const parameters = traverseResult.parameters.slice(numParamsBefore).map((_, index) => index + numParamsBefore);
-                collectDynamicQueryInfoTableRef(join.tableRef, joinType, joinQual, resultColumns, parameters, traverseResult);
+                collectDynamicQueryInfoTableRef(join.tableRef, joinType, joinQual, joinColumns, parameters, traverseResult);
             }
-            return resultColumns;
         });
-        allColumns.push(...joinColumns);
+        return {
+            columns: allColumns,
+            singleRow: false
+        };
     }
-    const func_table = table_ref.func_table();
+    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;
+}
+function traverse_select_with_parens_or_func_table(tableRef, context, traverseResult) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const func_table = tableRef.func_table();
     if (func_table) {
-        const funcAlias = ((_g = (_f = (_e = table_ref.func_alias_clause()) === null || _e === void 0 ? void 0 : _e.alias_clause()) === null || _f === void 0 ? void 0 : _f.colid()) === null || _g === void 0 ? void 0 : _g.getText()) || '';
+        const funcAlias = ((_c = (_b = (_a = tableRef.func_alias_clause()) === null || _a === void 0 ? void 0 : _a.alias_clause()) === null || _b === void 0 ? void 0 : _b.colid()) === null || _c === void 0 ? void 0 : _c.getText()) || '';
         const result = traverse_func_table(func_table, context, traverseResult);
         const resultWithAlias = result.columns.map(col => (Object.assign(Object.assign({}, col), { table_name: funcAlias || col.table_name })));
         return {
@@ -1467,19 +1498,18 @@ function traverse_table_ref(table_ref, context, traverseResult) {
             singleRow: result.singleRow
         };
     }
-    const select_with_parens = table_ref.select_with_parens();
+    const select_with_parens = tableRef.select_with_parens();
     if (select_with_parens) {
         const columns = traverse_select_with_parens(select_with_parens, Object.assign(Object.assign({}, context), { collectDynamicQueryInfo: false }), traverseResult);
+        const aliasNameList = (_f = (_e = (_d = tableRef.alias_clause()) === null || _d === void 0 ? void 0 : _d.name_list()) === null || _e === void 0 ? void 0 : _e.name_list()) === null || _f === void 0 ? void 0 : _f.map(name => name.getText());
+        const alias = (_h = (_g = tableRef.alias_clause()) === null || _g === void 0 ? void 0 : _g.colid().getText()) !== null && _h !== void 0 ? _h : '';
         const withAlias = columns.columns.map((col, i) => (Object.assign(Object.assign({}, col), { column_name: (aliasNameList === null || aliasNameList === void 0 ? void 0 : aliasNameList[i]) || col.column_name, table_name: alias || col.table_name })));
         return {
             columns: withAlias,
             singleRow: false
         };
     }
-    return {
-        columns: allColumns,
-        singleRow: false
-    };
+    throw Error('Stmt not expected:' + tableRef.getText());
 }
 function extractJoins(table_ref) {
     const joinList = [];
@@ -1528,7 +1558,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 [];
@@ -1556,7 +1586,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;
 }
@@ -1649,12 +1679,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
         };
     }
@@ -1666,7 +1696,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) {
@@ -1674,8 +1704,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) {
@@ -2052,7 +2098,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();
@@ -2350,8 +2396,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;
         }
     }