typesql-cli 0.19.0 → 0.19.2

package/postgres-query-analyzer/traverse.js

@@ -120,6 +120,7 @@ function traverse_selectstmt(selectstmt, context, traverseResult) {
     };
 }
 function traverse_select_no_parens(select_no_parens, context, traverseResult) {
+    var _a;
     const with_clause = select_no_parens.with_clause();
     if (with_clause) {
         with_clause.cte_list().common_table_expr_list()
@@ -137,11 +138,13 @@ function traverse_select_no_parens(select_no_parens, context, traverseResult) {
     const select_limit = select_no_parens.select_limit();
     if (select_limit) {
         const numParamsBefore = traverseResult.parameters.length;
-        const limit_clause = select_limit.limit_clause();
-        const limit_a_expr = limit_clause.select_limit_value().a_expr();
-        traverse_a_expr(limit_a_expr, context, traverseResult);
         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();
+            if (limit_a_expr) {
+                traverse_a_expr(limit_a_expr, context, traverseResult);
+            }
             if (context.collectDynamicQueryInfo) {
                 fragment += (0, select_columns_1.extractOriginalSql)(limit_clause);
             }
@@ -170,7 +173,7 @@ function traverse_common_table_expr(common_table_expr, context, traverseResult)
     const select_stmt = common_table_expr.preparablestmt().selectstmt();
     const numParamsBefore = traverseResult.parameters.length;
     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_name: tableName })));
+    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);
         (_a = traverseResult.dynamicQueryInfo) === null || _a === void 0 ? void 0 : _a.with.push({
@@ -188,11 +191,11 @@ function traverse_select_clause(select_clause, context, traverseResult) {
     //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 })); }) : [];
+        .map((col, index) => { var _a; return (Object.assign(Object.assign({}, col), { table: 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], 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 }));
+            const col = Object.assign({ column_name: value.column_name, is_nullable: value.is_nullable || unionResult.columns[columnIndex].is_nullable, table: '', schema: '', type: value.type }, (value.column_default && { column_default: value.column_default }));
             return col;
         });
     }
@@ -233,7 +236,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 +265,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
@@ -288,8 +291,8 @@ function computeNullability(values_result) {
     const result = values_result[0].map((_, i) => ({
         column_name: `column${i + 1}`,
         is_nullable: values_result.some(row => row[i].is_nullable),
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: values_result[0][i].type
     }));
     return result;
@@ -327,9 +330,9 @@ function traverse_target_list(target_list, context, traverseResult) {
                 columns.forEach(col => {
                     var _a;
                     (_a = traverseResult.dynamicQueryInfo) === null || _a === void 0 ? void 0 : _a.select.push({
-                        fragment: `${col.table_name}.${col.column_name}`,
-                        fragmentWitoutAlias: `${col.table_name}.${col.column_name}`,
-                        dependOnRelations: [col.table_name],
+                        fragment: `${col.table}.${col.column_name}`,
+                        fragmentWitoutAlias: `${col.table}.${col.column_name}`,
+                        dependOnRelations: [col.table],
                         parameters: []
                     });
                 });
@@ -338,7 +341,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];
     });
@@ -354,7 +357,7 @@ function traverse_target_el(target_el, context, traverseResult) {
         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)
+                if ((relation.name === exprResult.table || relation.alias === exprResult.table)
                     && relation.joinColumn === exprResult.column_name) {
                     relation.joinColumn = alias;
                 }
@@ -370,7 +373,7 @@ function traverse_target_el(target_el, context, traverseResult) {
                 parameters
             });
         }
-        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 }));
+        return Object.assign(Object.assign(Object.assign({ column_name: alias || exprResult.column_name, is_nullable: exprResult.is_nullable, table: exprResult.table, schema: exprResult.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');
 }
@@ -383,8 +386,8 @@ function traverse_a_expr(a_expr, context, traverseResult) {
     return {
         column_name: '',
         is_nullable: true,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'unknown'
     };
 }
@@ -411,8 +414,8 @@ function traverse_expr_or(a_expr_or, context, traverseResult) {
     return {
         column_name: '?column?',
         is_nullable: result.some(col => col.is_nullable),
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'bool'
     };
 }
@@ -424,8 +427,8 @@ function traverse_expr_and(a_expr_and, context, traverseResult) {
     return {
         column_name: '?column?',
         is_nullable: result.some(col => col.is_nullable),
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'bool'
     };
 }
@@ -441,8 +444,8 @@ function traverse_expr_between(a_expr_between, context, traverseResult) {
     return {
         column_name: a_expr_between.getText(),
         is_nullable: false,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'bool'
     };
 }
@@ -464,8 +467,8 @@ function traverse_expr_in(a_expr_in, context, traverseResult) {
         //id in (...)  -> is_nullable: false
         // value -> is_nullable = leftExprResult.is_nullable
         is_nullable: in_expr != null ? false : leftExprResult.is_nullable,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'bool'
     };
 }
@@ -516,7 +519,7 @@ function checkParamterNullability(column, traverseResult) {
     }
 }
 function getCheckConstraint(col, checkConstraints) {
-    const key = `[${col.table_schema}][${col.table_name}][${col.column_name}]`;
+    const key = `[${col.schema}][${col.table}][${col.column_name}]`;
     return checkConstraints[key];
 }
 function traverse_expr_compare(a_expr_compare, context, traverseResult) {
@@ -539,8 +542,8 @@ function traverse_expr_compare(a_expr_compare, context, traverseResult) {
         return {
             column_name: '?column?',
             is_nullable: result.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'bool'
         };
     }
@@ -550,8 +553,8 @@ function traverse_expr_compare(a_expr_compare, context, traverseResult) {
         return {
             column_name: '?column?',
             is_nullable: result.columns.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: result.columns[0].type
         };
     }
@@ -561,8 +564,8 @@ function traverse_expr_compare(a_expr_compare, context, traverseResult) {
         return {
             column_name: '?column?',
             is_nullable: result.is_nullable,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: result.type
         };
     }
@@ -578,8 +581,8 @@ function traverse_expr_like(a_expr_like, context, traverseResult) {
         return {
             column_name: '?column?',
             is_nullable: result.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'unknown'
         };
     }
@@ -595,8 +598,8 @@ function traverse_expr_qual_op(a_expr_qual_op, context, traverseResult) {
         return {
             column_name: '?column?',
             is_nullable: result.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'unknown'
         };
     }
@@ -613,8 +616,8 @@ function traverse_expr_unary_qualop(a_expr_unary_qualop, context, traverseResult
         const result = {
             column_name: '?column?',
             is_nullable: exprResult.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: mapAddExprType(exprResult.map(exprResult => exprResult.type))
         };
         return result;
@@ -632,8 +635,8 @@ function traverse_expr_mul(a_expr_mul, context, traverseResult) {
         const result = {
             column_name: '?column?',
             is_nullable: exprResult.some(exprRes => exprRes.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: mapAddExprType(exprResult.map(exprResult => exprResult.type))
         };
         return result;
@@ -651,8 +654,8 @@ function traverse_expr_caret(a_expr_caret, context, traverseResult) {
         const result = {
             column_name: '?column?',
             is_nullable: notNullInfo.some(notNullInfo => notNullInfo.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'unknown'
         };
         return result;
@@ -765,8 +768,8 @@ function traversec_expr(c_expr, context, traverseResult) {
                 return {
                     column_name: '?column?',
                     is_nullable: false, //empty array
-                    table_schema: '',
-                    table_name: '',
+                    schema: '',
+                    table: '',
                     type: 'unknown'
                 };
             }
@@ -782,8 +785,8 @@ function traversec_expr(c_expr, context, traverseResult) {
                 return {
                     column_name: columnref.getText(),
                     is_nullable: false,
-                    table_name: '',
-                    table_schema: '',
+                    table: '',
+                    schema: '',
                     type: 'unknown'
                 };
             }
@@ -793,8 +796,8 @@ function traversec_expr(c_expr, context, traverseResult) {
                 return {
                     column_name: columnref.getText(),
                     is_nullable: false,
-                    table_name: '',
-                    table_schema: '',
+                    table: '',
+                    schema: '',
                     type: 'record',
                     recordTypes: columns
                 };
@@ -811,8 +814,8 @@ function traversec_expr(c_expr, context, traverseResult) {
             return {
                 column_name: name,
                 is_nullable,
-                table_name: '',
-                table_schema: '',
+                table: '',
+                schema: '',
                 type
             };
         }
@@ -824,8 +827,8 @@ function traversec_expr(c_expr, context, traverseResult) {
             return {
                 column_name: c_expr.PARAM().getText(),
                 is_nullable: !!context.propagatesNull,
-                table_name: '',
-                table_schema: '',
+                table: '',
+                schema: '',
                 type: 'unknown'
             };
         }
@@ -847,7 +850,7 @@ function traversec_expr(c_expr, context, traverseResult) {
                     const a_expr = filter_clause.a_expr();
                     traverse_a_expr(a_expr, context, traverseResult);
                 }
-                return Object.assign(Object.assign({}, isNotNull), { table_name: '', table_schema: '' });
+                return Object.assign(Object.assign({}, isNotNull), { table: '', schema: '' });
             }
             const func_expr_common_subexpr = (_b = c_expr.func_expr()) === null || _b === void 0 ? void 0 : _b.func_expr_common_subexpr();
             if (func_expr_common_subexpr) {
@@ -863,8 +866,8 @@ function traversec_expr(c_expr, context, traverseResult) {
             return {
                 column_name: '?column?',
                 is_nullable,
-                table_name: '',
-                table_schema: '',
+                table: '',
+                schema: '',
                 type: result.columns[0].type,
                 jsonType: jsonType != null && jsonType.name === 'json' ? Object.assign(Object.assign({}, jsonType), { notNull: !is_nullable }) : jsonType
             };
@@ -880,8 +883,8 @@ function traversec_expr(c_expr, context, traverseResult) {
             return {
                 column_name: '?column?',
                 is_nullable: expr_list.some(col => col.is_nullable),
-                table_name: '',
-                table_schema: '',
+                table: '',
+                schema: '',
                 type: 'record',
                 recordTypes: expr_list.map(expr => (Object.assign(Object.assign({}, expr), { column_name: '' })))
             };
@@ -893,8 +896,8 @@ function traversec_expr(c_expr, context, traverseResult) {
             return {
                 column_name: '?column?',
                 is_nullable: expr_list.some(col => col.is_nullable),
-                table_name: '',
-                table_schema: '',
+                table: '',
+                schema: '',
                 type: 'unknown'
             };
         }
@@ -909,17 +912,17 @@ function traversec_expr(c_expr, context, traverseResult) {
         return {
             column_name: '?column?',
             is_nullable: false,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'bool'
         };
     }
     throw Error('traversec_expr -  Not expected:' + c_expr.getText());
 }
 function filterColumns(fromColumns, fieldName) {
-    return fromColumns.filter(col => (fieldName.prefix === '' || col.table_name === fieldName.prefix)
+    return fromColumns.filter(col => (fieldName.prefix === '' || col.table === fieldName.prefix)
         && (fieldName.name === '*' || col.column_name === fieldName.name)).map(col => {
-        const result = Object.assign(Object.assign(Object.assign({ column_name: col.column_name, is_nullable: col.is_nullable, table_name: col.table_name, table_schema: col.table_schema, type: col.type }, (col.column_key !== undefined) && { column_key: col.column_key }), (col.jsonType !== undefined) && { jsonType: col.jsonType }), (col.original_is_nullable !== undefined && { original_is_nullable: col.original_is_nullable }));
+        const result = Object.assign(Object.assign(Object.assign({ column_name: col.column_name, is_nullable: col.is_nullable, table: col.table, schema: col.schema, type: col.type }, (col.column_key !== undefined) && { column_key: col.column_key }), (col.jsonType !== undefined) && { jsonType: col.jsonType }), (col.original_is_nullable !== undefined && { original_is_nullable: col.original_is_nullable }));
         return result;
     });
 }
@@ -940,8 +943,8 @@ function traversec_expr_case(c_expr_case, context, traverseResult) {
     return {
         column_name: '?column?',
         is_nullable: !notNull,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: (_a = whenResult[0].type) !== null && _a !== void 0 ? _a : 'unknown',
         jsonType: allJsonTypesMatch(whenResult, elseResult) ? whenResult[0].jsonType : undefined
     };
@@ -979,8 +982,8 @@ function traversewhen_clause(when_clause, context, traverseResult) {
     return {
         column_name: '?column?',
         is_nullable: !notNull,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: whenExprResult[0].type,
         jsonType: whenExprResult[0].jsonType
     };
@@ -1027,10 +1030,10 @@ function mapJsonBuildArgsToJsonProperty(args, filterExpr) {
 }
 function inferJsonNullability(columns, filterExpr) {
     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);
+        && isNotNull_a_expr({ name: col.column_name, prefix: col.table }, filterExpr))
+        .map(col => col.table);
     const fields = columns.map(col => {
-        return col.original_is_nullable != null && tables.includes(col.table_name) ? !col.original_is_nullable : !col.is_nullable;
+        return col.original_is_nullable != null && tables.includes(col.table) ? !col.original_is_nullable : !col.is_nullable;
     });
     return fields;
 }
@@ -1061,8 +1064,8 @@ function traverse_json_build_obj_func(func_application, context, traverseResult)
     const result = {
         column_name: columnName,
         is_nullable: false,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'json',
         jsonType: {
             name: 'json',
@@ -1080,8 +1083,8 @@ function traverse_json_agg(func_application, context, traverseResult) {
     const result = {
         column_name: columnName,
         is_nullable: context.filter_expr != null,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'json[]',
         jsonType: createJsonTypeForJsonAgg(argsResult[0], context.filter_expr)
     };
@@ -1117,8 +1120,8 @@ function traversefunc_application(func_application, context, traverseResult) {
             return {
                 column_name: functionName,
                 is_nullable: false,
-                table_name: '',
-                table_schema: '',
+                table: '',
+                schema: '',
                 type: 'json',
                 jsonType
             };
@@ -1129,8 +1132,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: false,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'int8'
         };
     }
@@ -1139,8 +1142,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: argsResult.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'text'
         };
     }
@@ -1148,8 +1151,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: argsResult.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'tsvector'
         };
     }
@@ -1157,8 +1160,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: argsResult.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'float4'
         };
     }
@@ -1169,8 +1172,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: argsResult.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'tsquery'
         };
     }
@@ -1178,8 +1181,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: argsResult.some(col => col.is_nullable),
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'date'
         };
     }
@@ -1187,8 +1190,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: false,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'unknown'
         };
     }
@@ -1198,8 +1201,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: false,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'int4'
         };
     }
@@ -1208,8 +1211,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: false,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'float8'
         };
     }
@@ -1224,8 +1227,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: false,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'json[]',
             jsonType: {
                 name: 'json[]',
@@ -1237,8 +1240,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: true,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'json'
         };
     }
@@ -1249,8 +1252,8 @@ function traversefunc_application(func_application, context, traverseResult) {
         return {
             column_name: functionName,
             is_nullable: false,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'json',
             jsonType: {
                 name: 'json_map',
@@ -1263,15 +1266,15 @@ function traversefunc_application(func_application, context, traverseResult) {
             column_name: functionName,
             is_nullable: argsResult[0].is_nullable,
             type: argsResult[0].type,
-            table_name: '',
-            table_schema: ''
+            table: '',
+            schema: ''
         };
     }
     return {
         column_name: functionName,
         is_nullable: true,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'unknown'
     };
 }
@@ -1294,7 +1297,7 @@ function traversefunc_expr_common_subexpr(func_expr_common_subexpr, context, tra
             const paramResult = traverse_a_expr(func_arg_expr, Object.assign(Object.assign({}, context), { propagatesNull: true }), traverseResult);
             return paramResult;
         });
-        return Object.assign(Object.assign({}, result[0]), { is_nullable: result.every(col => col.is_nullable), table_name: '', table_schema: '' });
+        return Object.assign(Object.assign({}, result[0]), { is_nullable: result.every(col => col.is_nullable), table: '', schema: '' });
     }
     if (func_expr_common_subexpr.EXTRACT()) {
         const a_expr = func_expr_common_subexpr.extract_list().a_expr();
@@ -1302,8 +1305,8 @@ function traversefunc_expr_common_subexpr(func_expr_common_subexpr, context, tra
         return {
             column_name: 'extract',
             is_nullable: result.is_nullable,
-            table_name: '',
-            table_schema: '',
+            table: '',
+            schema: '',
             type: 'float8'
         };
     }
@@ -1313,8 +1316,8 @@ function traversefunc_expr_common_subexpr(func_expr_common_subexpr, context, tra
     return {
         column_name: func_expr_common_subexpr.getText(),
         is_nullable: true,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'unknown'
     };
 }
@@ -1326,18 +1329,18 @@ 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]), { is_nullable: traverse_expr_list_result.some(expr => expr.is_nullable), 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: '', schema: '' });
     }
     const array_expr_list = array_expr.array_expr_list();
     if (array_expr_list) {
         const traverse_array_expr_list_result = traverse_array_expr_list(array_expr_list, context, traverseResult);
-        return Object.assign(Object.assign({}, traverse_array_expr_list_result[0]), { column_name: '?column?', table_name: '', table_schema: '' });
+        return Object.assign(Object.assign({}, traverse_array_expr_list_result[0]), { column_name: '?column?', table: '', schema: '' });
     }
     return {
         column_name: array_expr.getText(),
         is_nullable: true,
-        table_name: '',
-        table_schema: '',
+        table: '',
+        schema: '',
         type: 'unknown'
     };
 }
@@ -1355,14 +1358,14 @@ function findColumn(fieldName, fromColumns) {
     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());
+    const col = fromColumns.find(col => (fieldName.prefix === '' || col.table.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({ name: field.column_name, prefix: field.table_name }, where_clause);
+    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;
 }
@@ -1386,8 +1389,8 @@ function traverse_from_list(from_list, context, traverseResult) {
     };
 }
 function getFromColumns(tableName, withColumns, dbSchema) {
-    const filteredWithColumns = withColumns.filter(col => col.table_name.toLowerCase() === tableName.name.toLowerCase());
-    const filteredSchema = filteredWithColumns.length > 0 ? filteredWithColumns : dbSchema.filter(col => col.table_name.toLowerCase() === tableName.name.toLowerCase());
+    const filteredWithColumns = withColumns.filter(col => col.table.toLowerCase() === tableName.name.toLowerCase());
+    const filteredSchema = filteredWithColumns.length > 0 ? filteredWithColumns : dbSchema.filter(col => col.table.toLowerCase() === tableName.name.toLowerCase());
     return filteredSchema;
 }
 function checkLeftJoinIsNullable(leftJoin, subsequentJoins, fromColumns) {
@@ -1427,12 +1430,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() })));
+        const fromColumnsResult = fromColumns.map(col => (Object.assign(Object.assign({}, col), { table: 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;
@@ -1450,41 +1455,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 = 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;
@@ -1492,7 +1520,7 @@ function traverse_select_with_parens_or_func_table(tableRef, context, traverseRe
     if (func_table) {
         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 })));
+        const resultWithAlias = result.columns.map(col => (Object.assign(Object.assign({}, col), { table: funcAlias || col.table })));
         return {
             columns: resultWithAlias,
             singleRow: result.singleRow
@@ -1503,7 +1531,7 @@ function traverse_select_with_parens_or_func_table(tableRef, context, traverseRe
         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 })));
+        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: alias || col.table })));
         return {
             columns: withAlias,
             singleRow: false
@@ -1634,38 +1662,79 @@ function parseReturnType(returnType) {
     if (setofMatch) {
         return { kind: 'setof', table: setofMatch[1] };
     }
+    else {
+        return { kind: 'table_name', table: trimmed };
+    }
     throw new Error(`Unsupported return type format: ${returnType}`);
 }
+function handleFunctionReturn(dbSchema, returnType) {
+    switch (returnType.kind) {
+        case 'table':
+            const columns = handleTableReturnType(returnType);
+            return {
+                columns,
+                singleRow: false
+            };
+        case 'setof':
+        case 'table_name':
+            const tableName = (0, select_columns_1.splitName)(returnType.table);
+            const setOfColumns = dbSchema.filter(col => col.table.toLowerCase() === tableName.name && tableName.prefix === '' || col.schema === tableName.prefix);
+            return {
+                columns: setOfColumns,
+                singleRow: false
+            };
+    }
+}
+function handleTableReturnType(returnType) {
+    const columns = returnType.columns.map(col => {
+        const columnInfo = {
+            column_name: col.name,
+            type: col.type,
+            is_nullable: true,
+            table: '',
+            schema: ''
+        };
+        return columnInfo;
+    });
+    return columns;
+}
+function parseArgumentList(argString) {
+    return argString
+        .split(',')
+        .map(arg => arg.trim())
+        .filter(arg => arg.length > 0)
+        .map(arg => {
+        const [name, ...typeParts] = arg.split(/\s+/);
+        return {
+            name,
+            type: typeParts.join(' ') // Handles multi-word types like "character varying"
+        };
+    });
+}
 function traverse_func_expr_windowless(func_expr_windowless, context, traverseResult) {
     const func_application = func_expr_windowless.func_application();
     if (func_application) {
-        const func_name = func_application.func_name().getText().toLowerCase();
-        const funcSchema = context.userFunctions.find(func => func.function_name.toLowerCase() === func_name);
+        const func_name = (0, select_columns_1.splitName)(func_application.func_name().getText().toLowerCase());
+        const funcSchema = context.userFunctions.find(func => func.function_name.toLowerCase() === func_name.name && (func_name.prefix === '' || func_name.prefix === func.schema));
         if (funcSchema) {
             const definition = funcSchema.definition;
             const returnType = parseReturnType(funcSchema.return_type);
-            const functionColumns = returnType.kind === 'table' ? returnType.columns.map(col => {
-                const columnInfo = {
-                    column_name: col.name,
-                    type: col.type,
-                    is_nullable: true,
-                    table_name: '',
-                    table_schema: ''
-                };
-                return columnInfo;
-            }) : context.dbSchema.filter(col => col.table_name.toLowerCase() === returnType.table);
+            const argList = parseArgumentList(funcSchema.arguments);
+            const functionResult = handleFunctionReturn(context.dbSchema, returnType);
             if (funcSchema.language.toLowerCase() === 'sql') {
                 const parser = (0, postgres_1.parseSql)(definition);
                 const selectstmt = parser.stmt().selectstmt();
-                const { columns, multipleRowsResult } = traverseSelectstmt(selectstmt, context, traverseResult);
+                const params = argList.map(arg => ({ column_name: arg.name, type: arg.type, is_nullable: false, schema: funcSchema.schema, table: '$' }));
+                const newFromColumns = params.concat(context.fromColumns);
+                const { columns, multipleRowsResult } = traverseSelectstmt(selectstmt, Object.assign(Object.assign({}, context), { fromColumns: newFromColumns }), traverseResult);
                 return {
-                    columns: columns.map((c) => (Object.assign(Object.assign({}, c), { table_name: funcSchema.function_name }))),
+                    columns: columns.map((c) => (Object.assign(Object.assign({}, c), { table: funcSchema.function_name }))),
                     singleRow: !multipleRowsResult
                 };
             }
             else {
                 return {
-                    columns: functionColumns,
+                    columns: functionResult.columns.map((c) => (Object.assign(Object.assign({}, c), { table: funcSchema.function_name, schema: funcSchema.schema }))),
                     singleRow: false
                 };
             }
@@ -1762,8 +1831,8 @@ function traverseInsertstmt(insertstmt, dbSchema) {
         parameters: []
     };
     const insert_target = insertstmt.insert_target();
-    const tableName = insert_target.getText();
-    const insertColumns = dbSchema.filter(col => col.table_name.toLowerCase() === tableName.toLowerCase());
+    const tableName = (0, select_columns_1.splitName)(insert_target.getText());
+    const insertColumns = filterSchemaColumns(dbSchema, tableName);
     const insert_rest = insertstmt.insert_rest();
     const insertColumnsList = insert_rest.insert_column_list()
         .insert_column_item_list()
@@ -1803,8 +1872,8 @@ function traverseInsertstmt(insertstmt, dbSchema) {
 function traverseDeletestmt(deleteStmt, dbSchema, traverseResult) {
     var _a;
     const relation_expr = deleteStmt.relation_expr_opt_alias().relation_expr();
-    const tableName = relation_expr.getText();
-    const deleteColumns = dbSchema.filter(col => col.table_name.toLowerCase() === tableName.toLowerCase());
+    const tableName = (0, select_columns_1.splitName)(relation_expr.getText());
+    const deleteColumns = filterSchemaColumns(dbSchema, tableName);
     const paramIsListResult = getInParameterList(deleteStmt);
     const returning_clause = deleteStmt.returning_clause();
     const context = {
@@ -1837,13 +1906,17 @@ function traverseDeletestmt(deleteStmt, dbSchema, traverseResult) {
 function addConstraintIfNotNull(checkConstraint) {
     return checkConstraint !== undefined ? { checkConstraint } : undefined;
 }
+function filterSchemaColumns(dbSchema, tableName) {
+    return dbSchema.filter(col => col.table.toLowerCase() === tableName.name.toLowerCase()
+        && (tableName.prefix === '' || col.schema.toLowerCase() === tableName.prefix.toLowerCase()));
+}
 function traverseUpdatestmt(updatestmt, traverseContext, traverseResult) {
     var _a;
     const relation_expr_opt_alias = updatestmt.relation_expr_opt_alias();
-    const tableName = relation_expr_opt_alias.relation_expr().getText();
+    const tableName = (0, select_columns_1.splitName)(relation_expr_opt_alias.relation_expr().getText());
     const tableAlias = ((_a = relation_expr_opt_alias.colid()) === null || _a === void 0 ? void 0 : _a.getText()) || '';
-    const updateColumns = traverseContext.dbSchema.filter(col => col.table_name.toLowerCase() === tableName.toLowerCase())
-        .map(col => (Object.assign(Object.assign({}, col), { table_name: tableAlias || col.table_name })));
+    const updateColumns = filterSchemaColumns(traverseContext.dbSchema, tableName)
+        .map(col => (Object.assign(Object.assign({}, col), { table: tableAlias || col.table })));
     const context = Object.assign(Object.assign({}, traverseContext), { fromColumns: updateColumns, collectNestedInfo: false, collectDynamicQueryInfo: false });
     updatestmt.set_clause_list().set_clause_list()
         .forEach(set_clause => traverse_set_clause(set_clause, context, traverseResult));
@@ -1877,7 +1950,7 @@ function traverse_set_clause(set_clause, context, traverseResult) {
     const columnName = (0, select_columns_1.splitName)(set_target.getText());
     const column = findColumn(columnName, context.fromColumns);
     const a_expr = set_clause.a_expr();
-    const excludedColumns = context.fromColumns.map((col) => (Object.assign(Object.assign({}, col), { table_name: 'excluded' })));
+    const excludedColumns = context.fromColumns.map((col) => (Object.assign(Object.assign({}, col), { table: 'excluded' })));
     const a_exprResult = traverse_a_expr(a_expr, Object.assign(Object.assign({}, context), { fromColumns: context.fromColumns.concat(excludedColumns) }), traverseResult);
     if (isParameter(a_exprResult.column_name)) {
         traverseResult.parameters.at(-1).isNotNull = !column.is_nullable;
@@ -2416,7 +2489,7 @@ function checkLimit(selectstmt) {
 function traverseCopystmt(copyStmt, dbSchema, traverseResult) {
     var _a, _b;
     const tableName = copyStmt.qualified_name().getText();
-    const copyColumns = dbSchema.filter(col => col.table_name.toLowerCase() === tableName.toLowerCase());
+    const copyColumns = dbSchema.filter(col => col.table.toLowerCase() === tableName.toLowerCase());
     const columnlist = (_b = (_a = copyStmt.column_list_()) === null || _a === void 0 ? void 0 : _a.columnlist()) === null || _b === void 0 ? void 0 : _b.columnElem_list().map(columnElem => traverse_columnElem(columnElem, copyColumns, traverseResult));
     return {
         queryType: 'Copy',