typesql-cli 0.18.4 → 0.18.6

package/postgres-query-analyzer/traverse.js

@@ -7,6 +7,7 @@ const PostgreSQLParser_1 = require("@wsporto/typesql-parser/postgres/PostgreSQLP
 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");
 function defaultOptions() {
     return {
         collectNestedInfo: false,
@@ -123,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();
@@ -181,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;
@@ -243,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
@@ -358,7 +370,7 @@ function traverse_target_el(target_el, context, traverseResult) {
                 parameters
             });
         }
-        return Object.assign(Object.assign({ column_name: alias || exprResult.column_name, is_nullable: exprResult.is_nullable && exprResult.column_default !== true, table_name: exprResult.table_name, table_schema: exprResult.table_schema, type: exprResult.type }, (exprResult.column_key != null && { column_key: exprResult.column_key })), (exprResult.jsonType != null && { jsonType: exprResult.jsonType }));
+        return Object.assign(Object.assign(Object.assign({ column_name: alias || exprResult.column_name, is_nullable: exprResult.is_nullable, table_name: exprResult.table_name, table_schema: exprResult.table_schema, type: exprResult.type }, (exprResult.column_default != null) && { column_default: exprResult.column_default }), (exprResult.column_key != null && { column_key: exprResult.column_key })), (exprResult.jsonType != null && { jsonType: exprResult.jsonType }));
     }
     throw Error('Column not found');
 }
@@ -746,7 +758,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'
@@ -760,6 +772,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);
@@ -831,13 +852,15 @@ function traversec_expr(c_expr, context, traverseResult) {
         const select_with_parens = c_expr.select_with_parens();
         if (select_with_parens) {
             const result = traverse_select_with_parens(select_with_parens, Object.assign(Object.assign({}, context), { parentColumns: context.fromColumns, fromColumns: [] }), traverseResult);
+            const jsonType = result.columns[0].jsonType;
+            const is_nullable = jsonType == null ? true : jsonType.name !== 'json[]' && jsonType.name !== 'json_map'; //json[], json_map are not nullable
             return {
                 column_name: '?column?',
-                is_nullable: result.columns[0].jsonType ? result.columns[0].is_nullable : true,
+                is_nullable,
                 table_name: '',
                 table_schema: '',
                 type: result.columns[0].type,
-                jsonType: result.columns[0].jsonType
+                jsonType: jsonType != null && jsonType.name === 'json' ? Object.assign(Object.assign({}, jsonType), { notNull: !is_nullable }) : jsonType
             };
         }
         const a_expr_in_parens = c_expr._a_expr_in_parens;
@@ -902,23 +925,37 @@ function excludeColumns(fromColumns, excludeList) {
     });
 }
 function traversec_expr_case(c_expr_case, context, traverseResult) {
-    var _a, _b;
+    var _a;
     const case_expr = c_expr_case.case_expr();
-    const whenResult = case_expr.when_clause_list().when_clause_list().map(when_clause => traversewhen_clause(when_clause, context, traverseResult));
-    const whenIsNotNull = whenResult.every(when => when);
-    const elseExpr = (_a = case_expr.case_default()) === null || _a === void 0 ? void 0 : _a.a_expr();
-    const elseResult = elseExpr ? traverse_a_expr(elseExpr, Object.assign({}, context), traverseResult) : null;
-    const elseIsNotNull = (elseResult === null || elseResult === void 0 ? void 0 : elseResult.is_nullable) === false || false;
+    const whenClauseList = case_expr.when_clause_list().when_clause_list();
+    const whenResult = whenClauseList.map(when_clause => traversewhen_clause(when_clause, context, traverseResult));
+    const whenIsNotNull = whenResult.every(when => !when.is_nullable);
+    const elseExpr = case_expr.case_default();
+    const elseResult = elseExpr ? traverse_a_expr(elseExpr.a_expr(), Object.assign({}, context), traverseResult) : null;
+    const branchNotNull = elseResult ? evaluateBranches(whenClauseList, elseExpr, whenResult.map(col => !col.is_nullable)) : false;
+    const elseIsNotNull = (elseResult === null || elseResult === void 0 ? void 0 : elseResult.is_nullable) === false || branchNotNull;
     const notNull = elseIsNotNull && whenIsNotNull;
     return {
         column_name: '?column?',
         is_nullable: !notNull,
         table_name: '',
         table_schema: '',
-        type: (_b = whenResult[0].type) !== null && _b !== void 0 ? _b : 'unknown',
+        type: (_a = whenResult[0].type) !== null && _a !== void 0 ? _a : 'unknown',
         jsonType: allJsonTypesMatch(whenResult, elseResult) ? whenResult[0].jsonType : undefined
     };
 }
+function evaluateBranches(whenClauseList, elseExpr, whenIsNotNull) {
+    const exprIndex = whenClauseList.findIndex(when => {
+        const whenExpr = when.a_expr(0);
+        const evaluatesIfNull = (0, case_nullability_checker_1.evaluatesTrueIfNull)(elseExpr, whenExpr);
+        if (evaluatesIfNull) {
+            return true;
+        }
+        return false;
+    });
+    const result = exprIndex !== -1 ? whenIsNotNull[exprIndex] : false;
+    return result;
+}
 function allJsonTypesMatch(whenResultList, elseResult) {
     var _a;
     const firstType = (_a = whenResultList[0]) === null || _a === void 0 ? void 0 : _a.jsonType;
@@ -936,7 +973,7 @@ function traversewhen_clause(when_clause, context, traverseResult) {
         const thenExprResult = traverse_a_expr(thenExpr, Object.assign(Object.assign({}, context), { filter_expr: whenExprList[index] }), traverseResult);
         return thenExprResult;
     });
-    const notNull = whenExprResult.every(res => res);
+    const notNull = whenExprResult.every(res => !res.is_nullable);
     return {
         column_name: '?column?',
         is_nullable: !notNull,
@@ -987,7 +1024,9 @@ function mapJsonBuildArgsToJsonProperty(args, filterExpr) {
     return properties;
 }
 function inferJsonNullability(columns, filterExpr) {
-    const tables = columns.filter(col => filterExpr && col.original_is_nullable === false && isNotNull_a_expr(col, filterExpr)).map(col => col.table_name);
+    const tables = columns.filter(col => filterExpr && col.original_is_nullable === false
+        && isNotNull_a_expr({ name: col.column_name, prefix: col.table_name }, filterExpr))
+        .map(col => col.table_name);
     const fields = columns.map(col => {
         return col.original_is_nullable != null && tables.includes(col.table_name) ? !col.original_is_nullable : !col.is_nullable;
     });
@@ -996,19 +1035,20 @@ function inferJsonNullability(columns, filterExpr) {
 function transformFieldsToJsonObjType(fields) {
     const jsonObject = {
         name: 'json',
+        notNull: true,
         properties: fields.map(col => mapFieldToPropertyDef(col))
     };
     return jsonObject;
 }
 function mapFieldToPropertyDef(field) {
     const prop = {
-        key: field.name,
+        key: field.column_name,
         type: transformFieldToJsonField(field)
     };
     return prop;
 }
 function transformFieldToJsonField(field) {
-    const jsonField = { name: 'json_field', type: field.type, notNull: field.notNull };
+    const jsonField = field.jsonType ? field.jsonType : { name: 'json_field', type: field.type, notNull: !field.is_nullable };
     return jsonField;
 }
 function traverse_json_build_obj_func(func_application, context, traverseResult) {
@@ -1024,6 +1064,7 @@ function traverse_json_build_obj_func(func_application, context, traverseResult)
         type: 'json',
         jsonType: {
             name: 'json',
+            notNull: true,
             properties: mapJsonBuildArgsToJsonProperty(argsResult, context.filter_expr),
         }
     };
@@ -1040,23 +1081,26 @@ function traverse_json_agg(func_application, context, traverseResult) {
         table_name: '',
         table_schema: '',
         type: 'json[]',
-        jsonType: {
-            name: 'json[]',
-            properties: createJsonTypeForJsonAgg(argsResult[0], context.filter_expr)
-        }
+        jsonType: createJsonTypeForJsonAgg(argsResult[0], context.filter_expr)
     };
     return result;
 }
 function createJsonTypeForJsonAgg(arg, filter_expr) {
     if (arg.recordTypes) {
         const jsonType = mapRecordsToJsonType(arg.recordTypes, filter_expr);
-        return [jsonType];
+        return {
+            name: 'json[]',
+            properties: [jsonType]
+        };
     }
-    return [arg.jsonType || { name: 'json_field', type: arg.type, notNull: !arg.is_nullable }];
+    const jsonType = arg.jsonType ? { name: 'json[]', properties: [arg.jsonType] } : undefined;
+    const fieldType = { name: 'json[]', properties: [{ name: 'json_field', type: arg.type, notNull: !arg.is_nullable }] };
+    const result = jsonType || fieldType;
+    return result;
 }
 function mapRecordsToJsonType(recordTypes, filterExpr) {
     const jsonNullability = inferJsonNullability(recordTypes, filterExpr);
-    const fields = recordTypes.map((col, index) => ({ name: col.column_name ? col.column_name : `f${index + 1}`, type: col.type, notNull: jsonNullability[index] }));
+    const fields = recordTypes.map((col, index) => (Object.assign(Object.assign({}, col), { column_name: col.column_name ? col.column_name : `f${index + 1}`, is_nullable: !jsonNullability[index] })));
     const jsonType = transformFieldsToJsonObjType(fields);
     return jsonType;
 }
@@ -1212,6 +1256,15 @@ function traversefunc_application(func_application, context, traverseResult) {
             }
         };
     }
+    if (functionName === 'unnest') {
+        return {
+            column_name: functionName,
+            is_nullable: argsResult[0].is_nullable,
+            type: argsResult[0].type,
+            table_name: '',
+            table_schema: ''
+        };
+    }
     return {
         column_name: functionName,
         is_nullable: true,
@@ -1271,7 +1324,7 @@ function traverse_array_expr(array_expr, context, traverseResult) {
     const expr_list = array_expr.expr_list();
     if (expr_list) {
         const traverse_expr_list_result = traverse_expr_list(expr_list, context, traverseResult);
-        return Object.assign(Object.assign({}, traverse_expr_list_result[0]), { column_name: '?column?', table_name: '', table_schema: '' });
+        return Object.assign(Object.assign({}, traverse_expr_list_result[0]), { is_nullable: traverse_expr_list_result.some(expr => expr.is_nullable), column_name: '?column?', table_name: '', table_schema: '' });
     }
     const array_expr_list = array_expr.array_expr_list();
     if (array_expr_list) {
@@ -1293,17 +1346,21 @@ function traverse_array_expr_list(array_expr_list, context, traverseResult) {
     return result;
 }
 function findColumn(fieldName, fromColumns) {
-    const col = fromColumns.find(col => (fieldName.prefix === '' || col.table_name.toLowerCase() === fieldName.prefix.toLowerCase()) && col.column_name.toLowerCase() === fieldName.name.toLowerCase());
+    const col = findColumnOrNull(fieldName, fromColumns);
     if (col == null) {
         throw Error('Column not found: ' + fieldNameToString(fieldName));
     }
     return col;
 }
+function findColumnOrNull(fieldName, fromColumns) {
+    const col = fromColumns.find(col => (fieldName.prefix === '' || col.table_name.toLowerCase() === fieldName.prefix.toLowerCase()) && col.column_name.toLowerCase() === fieldName.name.toLowerCase());
+    return col;
+}
 function fieldNameToString(fieldName) {
     return fieldName.prefix !== '' ? `${fieldName.prefix}.${fieldName.name}` : fieldName.name;
 }
 function checkIsNullable(where_clause, field) {
-    const isNotNullResult = !field.is_nullable || isNotNull(field, where_clause);
+    const isNotNullResult = !field.is_nullable || isNotNull({ name: field.column_name, prefix: field.table_name }, where_clause);
     const col = Object.assign(Object.assign({}, field), { is_nullable: !isNotNullResult });
     return col;
 }
@@ -1331,19 +1388,48 @@ function getFromColumns(tableName, withColumns, dbSchema) {
     const filteredSchema = filteredWithColumns.length > 0 ? filteredWithColumns : dbSchema.filter(col => col.table_name.toLowerCase() === tableName.name.toLowerCase());
     return filteredSchema;
 }
+function checkLeftJoinIsNullable(leftJoin, subsequentJoins, fromColumns) {
+    if (!leftJoin.joinQual) {
+        return true; // No condition = always nullable
+    }
+    const leftTable = getTableName(leftJoin.tableRef);
+    const leftJoinColumns = getJoinColumns(leftJoin.joinQual)
+        .filter(col => {
+        if (col.prefix === leftTable.name && col.prefix === leftTable.alias) {
+            return true;
+        }
+        if (findColumnOrNull(col, fromColumns)) { //column without table reference (ex: fk_user)
+            return true;
+        }
+        return false;
+    });
+    for (const join of subsequentJoins) {
+        // Only INNER JOINs can cancel nullability
+        if (!(join.joinType === null || join.joinType.INNER_P())) {
+            continue;
+        }
+        const joinConditionColumns = getJoinColumns(join.joinQual);
+        const filteredJoinColumnsFromLeft = joinConditionColumns.filter(col => leftJoinColumns.some(lc => lc.prefix === col.prefix));
+        // Are *all* columns from the left join used in not-null filtering?
+        const referencesLeftJoin = filteredJoinColumnsFromLeft.length > 0 &&
+            filteredJoinColumnsFromLeft.every(col => { var _a; return isNotNull_a_expr(col, (_a = join.joinQual) === null || _a === void 0 ? void 0 : _a.a_expr()); });
+        if (referencesLeftJoin) {
+            return false; // LEFT JOIN is effectively filtered by INNER JOIN — not nullable
+        }
+    }
+    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');
@@ -1353,38 +1439,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) => {
+        joinList.forEach((join, index) => {
             const joinType = join.joinType; //INNER, LEFT
             const joinQual = join.joinQual;
             const numParamsBefore = traverseResult.parameters.length;
-            const joinTableRefResult = traverse_table_ref(join.tableRef, context, 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 resultColumns = isLeftJoin ? filteredColumns.map(col => (Object.assign(Object.assign({}, col), { is_nullable: true, original_is_nullable: col.is_nullable }))) : filteredColumns;
+            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, 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 {
@@ -1392,25 +1496,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 withAlias = columns.columns.map((col, i) => ({
-            column_name: (aliasNameList === null || aliasNameList === void 0 ? void 0 : aliasNameList[i]) || col.column_name,
-            is_nullable: col.is_nullable,
-            table_name: alias || col.table_name,
-            table_schema: col.table_schema,
-            type: col.type
-        }));
+        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 = [];
@@ -1720,7 +1817,7 @@ function traverseDeletestmt(deleteStmt, dbSchema, traverseResult) {
     return result;
 }
 function addConstraintIfNotNull(checkConstraint) {
-    return checkConstraint !== undefined ? { checkConstraint } : {};
+    return checkConstraint !== undefined ? { checkConstraint } : undefined;
 }
 function traverseUpdatestmt(updatestmt, traverseContext, traverseResult) {
     var _a;
@@ -1853,7 +1950,14 @@ function isNotNull_a_expr_unary_not(a_expr_unary_not, field) {
 function isNotNull_a_expr_isnull(a_expr_isnull, field) {
     const a_expr_is_not = a_expr_isnull.a_expr_is_not();
     if (a_expr_is_not) {
-        return isNotNull_a_expr_is_not(a_expr_is_not, field);
+        const isNotNull = isNotNull_a_expr_is_not(a_expr_is_not, field);
+        if (isNotNull && a_expr_is_not.IS() && a_expr_is_not.NOT() && a_expr_is_not.NULL_P()) {
+            return true;
+        }
+        if (a_expr_is_not.IS() && a_expr_is_not.NULL_P()) {
+            return false;
+        }
+        return isNotNull;
     }
     return false;
 }
@@ -1977,7 +2081,7 @@ function isNotNull_c_expr(c_expr, field) {
         const columnref = c_expr.columnref();
         if (columnref) {
             const fieldName = (0, select_columns_1.splitName)(columnref.getText());
-            return (fieldName.name === field.column_name && (fieldName.prefix === '' || field.table_name === fieldName.prefix));
+            return (fieldName.name === field.name && (fieldName.prefix === '' || field.prefix === fieldName.prefix));
         }
         const aexprconst = c_expr.aexprconst();
         if (aexprconst) {
@@ -2004,7 +2108,7 @@ function isParameter(str) {
     return paramPattern.test(str);
 }
 function isSingleRowResult(selectstmt, fromColumns) {
-    var _a, _b;
+    var _a;
     const limit = checkLimit(selectstmt);
     if (limit === 1) {
         return true;
@@ -2018,11 +2122,11 @@ function isSingleRowResult(selectstmt, fromColumns) {
     const simple_select_pramary = simple_select_pramary_list[0];
     const from_clause = simple_select_pramary.from_clause();
     if (!from_clause) {
-        const hasSetReturningFunction = (_b = simple_select_pramary.target_list_()) === null || _b === void 0 ? void 0 : _b.target_list().target_el_list().some(target_el => isSetReturningFunction_target_el(target_el));
+        const hasSetReturningFunction = hasFunction(simple_select_pramary, fun => isSetReturningFunction(fun));
         return !hasSetReturningFunction;
     }
     if (!simple_select_pramary.group_clause()) {
-        const agreegateFunction = hasAggregateFunction(simple_select_pramary);
+        const agreegateFunction = hasFunction(simple_select_pramary, fun => isAggregateFunction(fun));
         if (agreegateFunction) {
             return true;
         }
@@ -2042,28 +2146,32 @@ function isSingleRowResult(selectstmt, fromColumns) {
     }
     return false;
 }
-function hasAggregateFunction(simple_select_pramary) {
+function hasFunction(simple_select_pramary, checkFunction) {
     const target_list_ = simple_select_pramary.target_list_();
     if (target_list_) {
-        return target_list_.target_list().target_el_list().some(target_el => isAggregateFunction_target_el(target_el));
+        return target_list_.target_list().target_el_list().some(target_el => checkFunction_target_el(target_el, checkFunction));
     }
     const target_list = simple_select_pramary.target_list();
-    return target_list.target_el_list().some(target_el => isAggregateFunction_target_el(target_el));
+    if (target_list) {
+        return target_list.target_el_list().some(target_el => checkFunction_target_el(target_el, checkFunction));
+    }
+    return false;
 }
 function getTableName(table_ref) {
     const relation_expr = table_ref.relation_expr();
-    const tableName = relation_expr.qualified_name().getText();
+    if (relation_expr) {
+        return traverse_relation_expr(relation_expr);
+    }
     const aliasClause = table_ref.alias_clause();
-    const tableAlias = aliasClause ? aliasClause.colid().getText() : '';
     return {
-        name: tableName,
-        alias: tableAlias
+        name: aliasClause.colid().getText(),
+        alias: ''
     };
 }
-function isAggregateFunction_target_el(target_el) {
+function checkFunction_target_el(target_el, checkFunction) {
     if (target_el instanceof PostgreSQLParser_1.Target_labelContext) {
         const c_expr_list = collectContextsOfType(target_el, PostgreSQLParser_1.Func_exprContext, false);
-        const aggrFunction = c_expr_list.some(func_expr => isAggregateFunction_c_expr(func_expr));
+        const aggrFunction = c_expr_list.some(func_expr => checkFunction(func_expr));
         return aggrFunction;
     }
     return false;
@@ -2116,25 +2224,98 @@ const aggregateFunctions = new Set([
     'variance',
     'xmlagg'
 ]);
-function isAggregateFunction_c_expr(func_expr) {
+function isAggregateFunction(func_expr) {
     var _a, _b, _c;
     const funcName = (_c = (_b = (_a = func_expr === null || func_expr === void 0 ? void 0 : func_expr.func_application()) === null || _a === void 0 ? void 0 : _a.func_name()) === null || _b === void 0 ? void 0 : _b.getText()) === null || _c === void 0 ? void 0 : _c.toLowerCase();
     // RANK(), DENSE_RANK(), PERCENT_RANK() - they are window functions, not aggregate functions, 
     // even though your query is returning them from a join involving pg_aggregate.
     return !func_expr.over_clause() && aggregateFunctions.has(funcName);
 }
-function isSetReturningFunction_target_el(target_el) {
-    if (target_el instanceof PostgreSQLParser_1.Target_labelContext) {
-        const c_expr_list = collectContextsOfType(target_el, PostgreSQLParser_1.Func_exprContext);
-        const setReturningFunction = c_expr_list.some(func_expr => isSetReturningFunction_c_expr(func_expr));
-        return setReturningFunction;
-    }
-    return false;
-}
-function isSetReturningFunction_c_expr(func_expr) {
+// SELECT distinct '''' || p.proname || ''',' AS function_name
+// FROM pg_proc p
+// JOIN pg_namespace n ON p.pronamespace = n.oid
+// WHERE p.proretset = true
+// ORDER BY function_name;
+function isSetReturningFunction(func_expr) {
     var _a, _b, _c;
     const funcName = (_c = (_b = (_a = func_expr === null || func_expr === void 0 ? void 0 : func_expr.func_application()) === null || _a === void 0 ? void 0 : _a.func_name()) === null || _b === void 0 ? void 0 : _b.getText()) === null || _c === void 0 ? void 0 : _c.toLowerCase();
-    return funcName === 'generate_series';
+    const setReturning = new Set([
+        '_pg_expandarray',
+        'aclexplode',
+        'generate_series',
+        'generate_subscripts',
+        'get_clients_with_addresses',
+        'get_mytable1',
+        'get_mytable1_by_id',
+        'get_mytable1_with_nested_function',
+        'get_mytable_plpgsql',
+        'get_users_with_posts',
+        'get_users_with_posts_plpgsql',
+        'json_array_elements',
+        'json_array_elements_text',
+        'json_each',
+        'json_each_text',
+        'json_object_keys',
+        'json_populate_recordset',
+        'json_to_recordset',
+        'jsonb_array_elements',
+        'jsonb_array_elements_text',
+        'jsonb_each',
+        'jsonb_each_text',
+        'jsonb_object_keys',
+        'jsonb_path_query',
+        'jsonb_populate_recordset',
+        'jsonb_to_recordset',
+        'pg_available_extension_versions',
+        'pg_available_extensions',
+        'pg_config',
+        'pg_cursor',
+        'pg_event_trigger_ddl_commands',
+        'pg_event_trigger_dropped_objects',
+        'pg_extension_update_paths',
+        'pg_get_keywords',
+        'pg_get_multixact_members',
+        'pg_get_publication_tables',
+        'pg_get_replication_slots',
+        'pg_hba_file_rules',
+        'pg_listening_channels',
+        'pg_lock_status',
+        'pg_logical_slot_get_binary_changes',
+        'pg_logical_slot_get_changes',
+        'pg_logical_slot_peek_binary_changes',
+        'pg_logical_slot_peek_changes',
+        'pg_ls_archive_statusdir',
+        'pg_ls_dir',
+        'pg_ls_logdir',
+        'pg_ls_tmpdir',
+        'pg_ls_waldir',
+        'pg_mcv_list_items',
+        'pg_options_to_table',
+        'pg_partition_ancestors',
+        'pg_partition_tree',
+        'pg_prepared_statement',
+        'pg_prepared_xact',
+        'pg_show_all_file_settings',
+        'pg_show_all_settings',
+        'pg_show_replication_origin_status',
+        'pg_stat_get_activity',
+        'pg_stat_get_backend_idset',
+        'pg_stat_get_progress_info',
+        'pg_stat_get_wal_senders',
+        'pg_stop_backup',
+        'pg_tablespace_databases',
+        'pg_timezone_abbrevs',
+        'pg_timezone_names',
+        'regexp_matches',
+        'regexp_split_to_table',
+        'ts_debug',
+        'ts_parse',
+        'ts_stat',
+        'ts_token_type',
+        'txid_snapshot_xip',
+        'unnest'
+    ]);
+    return setReturning.has(funcName);
 }
 function isSingleRowResult_where(a_expr, uniqueKeys) {
     var _a, _b;