typesql-cli 0.17.7 → 0.18.1

package/postgres-query-analyzer/traverse.js

@@ -60,7 +60,7 @@ function traverseSmt(stmt, dbSchema, checkConstraints, options) {
     }
     throw Error('Stmt not supported: ' + stmt.getText());
 }
-function collectContextsOfType(ctx, targetType) {
+function collectContextsOfType(ctx, targetType, includeSubQuery = true) {
     var _a;
     const results = [];
     if (ctx instanceof targetType) {
@@ -68,7 +68,9 @@ function collectContextsOfType(ctx, targetType) {
     }
     (_a = ctx.children) === null || _a === void 0 ? void 0 : _a.forEach(child => {
         if (child instanceof typesql_parser_1.ParserRuleContext) {
-            results.push(...collectContextsOfType(child, targetType));
+            if (includeSubQuery || !(child instanceof PostgreSQLParser_1.Select_with_parensContext)) {
+                results.push(...collectContextsOfType(child, targetType, includeSubQuery));
+            }
         }
     });
     return results;
@@ -179,7 +181,7 @@ function traverse_select_clause(select_clause, context, traverseResult) {
     for (let index = 1; index < simple_select_intersect_list.length; index++) {
         const unionNotNull = traverse_simple_select_intersect(simple_select_intersect_list[index], context, traverseResult);
         selectColumns = selectColumns.map((value, columnIndex) => {
-            const col = Object.assign({ column_name: value.column_name, is_nullable: value.is_nullable || unionNotNull[columnIndex].is_nullable, table_name: '', table_schema: '' }, (value.column_default && { column_default: value.column_default }));
+            const col = Object.assign({ column_name: value.column_name, is_nullable: value.is_nullable || unionNotNull[columnIndex].is_nullable, table_name: '', table_schema: '', type: value.type }, (value.column_default && { column_default: value.column_default }));
             return col;
         });
     }
@@ -249,7 +251,18 @@ function extractRelations(a_expr) {
 }
 function traverse_values_clause(values_clause, context, traverseResult) {
     const expr_list_list = values_clause.expr_list_list();
-    return expr_list_list.flatMap(expr_list => traverse_expr_list(expr_list, context, traverseResult));
+    const values_result = expr_list_list.map(expr_list => traverse_expr_list(expr_list, context, traverseResult));
+    return computeNullability(values_result);
+}
+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: '',
+        type: values_result[0][i].type
+    }));
+    return result;
 }
 function traverse_expr_list(expr_list, context, traverseResult) {
     const columns = expr_list.a_expr_list().map((a_expr, index) => {
@@ -327,12 +340,7 @@ function traverse_target_el(target_el, context, traverseResult) {
                 parameters
             });
         }
-        return {
-            column_name: alias || exprResult.column_name,
-            is_nullable: exprResult.is_nullable,
-            table_name: exprResult.table_name,
-            table_schema: exprResult.table_schema
-        };
+        return 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.jsonType != null && { jsonType: exprResult.jsonType }));
     }
     throw Error('Column not found');
 }
@@ -346,7 +354,8 @@ function traverse_a_expr(a_expr, context, traverseResult) {
         column_name: '',
         is_nullable: true,
         table_name: '',
-        table_schema: ''
+        table_schema: '',
+        type: 'unknow'
     };
 }
 function traverse_a_expr_qual(a_expr_qual, context, traverseResult) {
@@ -373,7 +382,8 @@ function traverse_expr_or(a_expr_or, context, traverseResult) {
         column_name: '?column?',
         is_nullable: result.some(col => col.is_nullable),
         table_name: '',
-        table_schema: ''
+        table_schema: '',
+        type: 'bool'
     };
 }
 function traverse_expr_and(a_expr_and, context, traverseResult) {
@@ -385,7 +395,8 @@ function traverse_expr_and(a_expr_and, context, traverseResult) {
         column_name: '?column?',
         is_nullable: result.some(col => col.is_nullable),
         table_name: '',
-        table_schema: ''
+        table_schema: '',
+        type: 'bool'
     };
 }
 function traverse_expr_between(a_expr_between, context, traverseResult) {
@@ -401,7 +412,8 @@ function traverse_expr_between(a_expr_between, context, traverseResult) {
         column_name: a_expr_between.getText(),
         is_nullable: false,
         table_name: '',
-        table_schema: ''
+        table_schema: '',
+        type: 'bool'
     };
 }
 function traverse_expr_in(a_expr_in, context, traverseResult) {
@@ -423,7 +435,8 @@ function traverse_expr_in(a_expr_in, context, traverseResult) {
         // value -> is_nullable = leftExprResult.is_nullable
         is_nullable: in_expr != null ? false : leftExprResult.is_nullable,
         table_name: '',
-        table_schema: ''
+        table_schema: '',
+        type: 'bool'
     };
 }
 function traverse_in_expr(in_expr, context, traverseResult) {
@@ -496,7 +509,8 @@ function traverse_expr_compare(a_expr_compare, context, traverseResult) {
             column_name: '?column?',
             is_nullable: result.some(col => col.is_nullable),
             table_name: '',
-            table_schema: ''
+            table_schema: '',
+            type: 'bool'
         };
     }
     const select_with_parens = a_expr_compare.select_with_parens();
@@ -506,7 +520,8 @@ function traverse_expr_compare(a_expr_compare, context, traverseResult) {
             column_name: '?column?',
             is_nullable: result.some(col => col.is_nullable),
             table_name: '',
-            table_schema: ''
+            table_schema: '',
+            type: result[0].type
         };
     }
     const a_expr = a_expr_compare.a_expr();
@@ -516,7 +531,8 @@ function traverse_expr_compare(a_expr_compare, context, traverseResult) {
             column_name: '?column?',
             is_nullable: result.is_nullable,
             table_name: '',
-            table_schema: ''
+            table_schema: '',
+            type: result.type
         };
     }
     throw Error('traverse_expr_compare -  Not expected:' + a_expr_compare.getText());
@@ -532,7 +548,8 @@ function traverse_expr_like(a_expr_like, context, traverseResult) {
             column_name: '?column?',
             is_nullable: result.some(col => col.is_nullable),
             table_name: '',
-            table_schema: ''
+            table_schema: '',
+            type: 'unknow'
         };
     }
     throw Error('traverse_expr_like -  Not expected:' + a_expr_like.getText());
@@ -548,7 +565,8 @@ function traverse_expr_qual_op(a_expr_qual_op, context, traverseResult) {
             column_name: '?column?',
             is_nullable: result.some(col => col.is_nullable),
             table_name: '',
-            table_schema: ''
+            table_schema: '',
+            type: 'unknow'
         };
     }
     throw Error('traverse_expr_qual_op -  Not expected:' + a_expr_qual_op.getText());
@@ -556,6 +574,7 @@ function traverse_expr_qual_op(a_expr_qual_op, context, traverseResult) {
 function traverse_expr_unary_qualop(a_expr_unary_qualop, context, traverseResult) {
     const a_expr_add = a_expr_unary_qualop.a_expr_add();
     if (a_expr_add) {
+        //a_expr_mul ((MINUS | PLUS) a_expr_mul)*
         const exprResult = a_expr_add.a_expr_mul_list().map(a_expr_mul => traverse_expr_mul(a_expr_mul, context, traverseResult));
         if (exprResult.length === 1) {
             return exprResult[0];
@@ -564,7 +583,8 @@ function traverse_expr_unary_qualop(a_expr_unary_qualop, context, traverseResult
             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;
     }
@@ -573,15 +593,17 @@ function traverse_expr_unary_qualop(a_expr_unary_qualop, context, traverseResult
 function traverse_expr_mul(a_expr_mul, context, traverseResult) {
     const a_expr_mul_list = a_expr_mul.a_expr_caret_list();
     if (a_expr_mul_list) {
-        const notNullInfo = a_expr_mul.a_expr_caret_list().map(a_expr_caret => traverse_expr_caret(a_expr_caret, context, traverseResult));
-        if (notNullInfo.length === 1) {
-            return notNullInfo[0];
+        // a_expr_caret ((STAR | SLASH | PERCENT) a_expr_caret)*
+        const exprResult = a_expr_mul.a_expr_caret_list().map(a_expr_caret => traverse_expr_caret(a_expr_caret, context, traverseResult));
+        if (exprResult.length === 1) {
+            return exprResult[0];
         }
         const result = {
             column_name: '?column?',
-            is_nullable: notNullInfo.some(notNullInfo => notNullInfo.is_nullable),
+            is_nullable: exprResult.some(exprRes => exprRes.is_nullable),
             table_name: '',
-            table_schema: ''
+            table_schema: '',
+            type: mapAddExprType(exprResult.map(exprResult => exprResult.type))
         };
         return result;
     }
@@ -599,7 +621,8 @@ function traverse_expr_caret(a_expr_caret, context, traverseResult) {
             column_name: '?column?',
             is_nullable: notNullInfo.some(notNullInfo => notNullInfo.is_nullable),
             table_name: '',
-            table_schema: ''
+            table_schema: '',
+            type: 'unknow'
         };
         return result;
     }
@@ -638,8 +661,65 @@ function traverseColumnRef(columnref, fromColumns) {
     const col = findColumn(fieldName, fromColumns);
     return Object.assign(Object.assign({}, col), { is_nullable: col.is_nullable && col.column_default !== true });
 }
+function getNameAndTypeIdFromAExprConst(a_expr_const) {
+    var _a, _b;
+    if (a_expr_const.iconst()) {
+        return {
+            name: a_expr_const.getText(),
+            type: 'int4'
+        };
+    }
+    if (a_expr_const.fconst()) {
+        return {
+            name: a_expr_const.getText(),
+            type: 'float4'
+        };
+    }
+    const type_function_name = (_b = (_a = a_expr_const.func_name()) === null || _a === void 0 ? void 0 : _a.type_function_name()) === null || _b === void 0 ? void 0 : _b.getText().toLowerCase();
+    if (type_function_name === 'date') {
+        return {
+            name: 'date',
+            type: 'date'
+        };
+    }
+    if (a_expr_const.sconst()) {
+        return {
+            name: a_expr_const.getText().slice(1, -1),
+            type: 'text'
+        };
+    }
+    //binary
+    if (a_expr_const.bconst()) {
+        return {
+            name: a_expr_const.getText(),
+            type: 'bit'
+        };
+    }
+    if (a_expr_const.xconst()) {
+        return {
+            name: a_expr_const.getText(),
+            type: 'bytea'
+        };
+    }
+    if (a_expr_const.TRUE_P() || a_expr_const.FALSE_P()) {
+        return {
+            name: a_expr_const.getText(),
+            type: 'bool'
+        };
+    }
+    if (a_expr_const.NULL_P()) {
+        return {
+            name: a_expr_const.getText(),
+            type: 'unknow'
+        };
+    }
+    return {
+        name: a_expr_const.getText(),
+        type: 'unknow'
+    };
+}
 function traversec_expr(c_expr, context, traverseResult) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     if (c_expr instanceof PostgreSQLParser_1.C_expr_exprContext) {
         if (c_expr.ARRAY()) {
             const select_with_parens = c_expr.select_with_parens();
@@ -649,18 +729,14 @@ function traversec_expr(c_expr, context, traverseResult) {
                     column_name: '?column?',
                     is_nullable: true,
                     table_schema: '',
-                    table_name: ''
+                    table_name: '',
+                    type: 'unknow'
                 };
             }
             const array_expr = c_expr.array_expr();
             if (array_expr) {
-                traverse_array_expr(array_expr, context, traverseResult);
-                return {
-                    column_name: '?column?',
-                    is_nullable: false,
-                    table_schema: '',
-                    table_name: ''
-                };
+                const result = traverse_array_expr(array_expr, context, traverseResult);
+                return Object.assign(Object.assign({}, result), { type: `${result.type}[]` });
             }
         }
         const columnref = c_expr.columnref();
@@ -670,12 +746,14 @@ function traversec_expr(c_expr, context, traverseResult) {
         }
         const aexprconst = c_expr.aexprconst();
         if (aexprconst) {
+            const { name, type } = getNameAndTypeIdFromAExprConst(aexprconst);
             const is_nullable = aexprconst.NULL_P() != null;
             return {
-                column_name: aexprconst.getText(),
+                column_name: name,
                 is_nullable,
                 table_name: '',
-                table_schema: ''
+                table_schema: '',
+                type
             };
         }
         if (c_expr.PARAM()) {
@@ -687,37 +765,36 @@ function traversec_expr(c_expr, context, traverseResult) {
                 column_name: c_expr.PARAM().getText(),
                 is_nullable: !!context.propagatesNull,
                 table_name: '',
-                table_schema: ''
+                table_schema: '',
+                type: 'unknow'
             };
         }
         const func_application = (_a = c_expr.func_expr()) === null || _a === void 0 ? void 0 : _a.func_application();
         if (func_application) {
+            if (is_json_build_object_func(func_application)) {
+                return traverse_json_build_obj_func(func_application, context, traverseResult);
+            }
+            if (is_json_agg(func_application)) {
+                return traverse_json_agg(func_application, context, traverseResult);
+            }
             const isNotNull = traversefunc_application(func_application, context, traverseResult);
-            return {
-                column_name: ((_b = func_application.func_name()) === null || _b === void 0 ? void 0 : _b.getText()) || func_application.getText(),
-                is_nullable: !isNotNull,
-                table_name: '',
-                table_schema: ''
-            };
+            return Object.assign(Object.assign({}, isNotNull), { table_name: '', table_schema: '' });
         }
-        const func_expr_common_subexpr = (_c = c_expr.func_expr()) === null || _c === void 0 ? void 0 : _c.func_expr_common_subexpr();
+        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) {
             const isNotNull = traversefunc_expr_common_subexpr(func_expr_common_subexpr, context, traverseResult);
-            return {
-                column_name: ((_e = (_d = func_expr_common_subexpr.getText().split('(')) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.trim()) || func_expr_common_subexpr.getText(),
-                is_nullable: !isNotNull,
-                table_name: '',
-                table_schema: ''
-            };
+            return Object.assign(Object.assign({}, isNotNull), { column_name: ((_d = (_c = func_expr_common_subexpr.getText().split('(')) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.trim()) || func_expr_common_subexpr.getText() });
         }
         const select_with_parens = c_expr.select_with_parens();
         if (select_with_parens) {
-            traverse_select_with_parens(select_with_parens, context, traverseResult);
+            const result = traverse_select_with_parens(select_with_parens, context, traverseResult);
             return {
                 column_name: '?column?',
                 is_nullable: true,
                 table_name: '',
-                table_schema: ''
+                table_schema: '',
+                type: result[0].type,
+                jsonType: result[0].jsonType
             };
         }
         const a_expr_in_parens = c_expr._a_expr_in_parens;
@@ -732,7 +809,8 @@ function traversec_expr(c_expr, context, traverseResult) {
                 column_name: '?column?',
                 is_nullable: expr_list.some(col => col.is_nullable),
                 table_name: '',
-                table_schema: ''
+                table_schema: '',
+                type: 'unknow'
             };
         }
         const implicit_row = c_expr.implicit_row();
@@ -743,18 +821,14 @@ function traversec_expr(c_expr, context, traverseResult) {
                 column_name: '?column?',
                 is_nullable: expr_list.some(col => col.is_nullable),
                 table_name: '',
-                table_schema: ''
+                table_schema: '',
+                type: 'unknow'
             };
         }
     }
     if (c_expr instanceof PostgreSQLParser_1.C_expr_caseContext) {
         const isNotNull = traversec_expr_case(c_expr, context, traverseResult);
-        return {
-            column_name: '?column?',
-            is_nullable: !isNotNull,
-            table_name: '',
-            table_schema: ''
-        };
+        return isNotNull;
     }
     if (c_expr instanceof PostgreSQLParser_1.C_expr_existsContext) {
         const select_with_parens = c_expr.select_with_parens();
@@ -763,7 +837,8 @@ function traversec_expr(c_expr, context, traverseResult) {
             column_name: '?column?',
             is_nullable: false,
             table_name: '',
-            table_schema: ''
+            table_schema: '',
+            type: 'bool'
         };
     }
     throw Error('traversec_expr -  Not expected:' + c_expr.getText());
@@ -775,7 +850,8 @@ function filterColumns(fromColumns, fieldName) {
             column_name: col.column_name,
             is_nullable: col.is_nullable,
             table_name: col.table_name,
-            table_schema: col.table_schema
+            table_schema: col.table_schema,
+            type: col.type
         };
         return result;
     });
@@ -788,13 +864,20 @@ function excludeColumns(fromColumns, excludeList) {
     });
 }
 function traversec_expr_case(c_expr_case, context, traverseResult) {
-    var _a;
+    var _a, _b;
     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 elseIsNotNull = elseExpr ? !traverse_a_expr(elseExpr, context, traverseResult).is_nullable : false;
-    return elseIsNotNull && whenIsNotNull;
+    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 : 'unknow'
+    };
 }
 function traversewhen_clause(when_clause, context, traverseResult) {
     const a_expr_list = when_clause.a_expr_list();
@@ -804,7 +887,14 @@ function traversewhen_clause(when_clause, context, traverseResult) {
         const thenExprResult = traverse_a_expr(thenExpr, context, traverseResult);
         return thenExprResult;
     });
-    return whenExprResult.every(res => res);
+    const notNull = whenExprResult.every(res => res);
+    return {
+        column_name: '?column?',
+        is_nullable: !notNull,
+        table_name: '',
+        table_schema: '',
+        type: whenExprResult[0].type
+    };
 }
 function partition(array, predicate) {
     return array.reduce((acc, curr, index) => {
@@ -817,37 +907,158 @@ function partition(array, predicate) {
         return acc;
     }, [[], []]);
 }
+function getFunctionName(func_application) {
+    const functionName = func_application.func_name().getText().toLowerCase();
+    return functionName;
+}
+function is_json_build_object_func(func_application) {
+    const functionName = getFunctionName(func_application);
+    return functionName === 'json_build_object'
+        || functionName === 'jsonb_build_object';
+}
+function is_json_agg(func_application) {
+    const functionName = getFunctionName(func_application);
+    return functionName === 'json_agg'
+        || functionName === 'jsonb_agg';
+}
+function transformToJsonProperty(args) {
+    const pairs = [];
+    for (let i = 0; i < args.length; i += 2) {
+        const key = args[i];
+        const value = args[i + 1];
+        if (value !== undefined) {
+            const type = value.jsonType ? value.jsonType : value.type;
+            pairs.push({ key: key.column_name, type, notNull: !value.is_nullable });
+        }
+    }
+    return pairs;
+}
+function traverse_json_build_obj_func(func_application, context, traverseResult) {
+    var _a, _b;
+    const columnName = ((_a = func_application.func_name()) === null || _a === void 0 ? void 0 : _a.getText()) || func_application.getText();
+    const func_arg_expr_list = ((_b = func_application.func_arg_list()) === null || _b === void 0 ? void 0 : _b.func_arg_expr_list()) || [];
+    const argsResult = func_arg_expr_list.map(func_arg_expr => traversefunc_arg_expr(func_arg_expr, context, traverseResult));
+    return {
+        column_name: columnName,
+        is_nullable: true,
+        table_name: '',
+        table_schema: '',
+        type: 'json',
+        jsonType: {
+            name: 'json',
+            properties: transformToJsonProperty(argsResult),
+        }
+    };
+}
+function traverse_json_agg(func_application, context, traverseResult) {
+    var _a, _b;
+    const columnName = ((_a = func_application.func_name()) === null || _a === void 0 ? void 0 : _a.getText()) || func_application.getText();
+    const func_arg_expr_list = ((_b = func_application.func_arg_list()) === null || _b === void 0 ? void 0 : _b.func_arg_expr_list()) || [];
+    const argsResult = func_arg_expr_list.map(func_arg_expr => traversefunc_arg_expr(func_arg_expr, context, traverseResult));
+    return {
+        column_name: columnName,
+        is_nullable: true,
+        table_name: '',
+        table_schema: '',
+        type: 'json[]',
+        jsonType: {
+            name: 'json[]',
+            properties: argsResult.map(arg => arg.jsonType || arg.type)
+        }
+    };
+}
 function traversefunc_application(func_application, context, traverseResult) {
     var _a;
-    const functionName = func_application.func_name().getText().toLowerCase();
+    const functionName = getFunctionName(func_application);
     const func_arg_expr_list = ((_a = func_application.func_arg_list()) === null || _a === void 0 ? void 0 : _a.func_arg_expr_list()) || [];
     const argsResult = func_arg_expr_list.map(func_arg_expr => traversefunc_arg_expr(func_arg_expr, context, traverseResult));
     if (functionName === 'count') {
-        return true;
+        return {
+            column_name: functionName,
+            is_nullable: false,
+            table_name: '',
+            table_schema: '',
+            type: 'int8'
+        };
     }
     if (functionName === 'concat'
-        || functionName === 'concat_ws'
-        || functionName === 'to_tsvector'
-        || functionName === 'to_tsquery'
-        || functionName === 'ts_rank'
+        || functionName === 'concat_ws') {
+        return {
+            column_name: functionName,
+            is_nullable: argsResult.some(col => col.is_nullable),
+            table_name: '',
+            table_schema: '',
+            type: 'text'
+        };
+    }
+    if (functionName === 'to_tsvector') {
+        return {
+            column_name: functionName,
+            is_nullable: argsResult.some(col => col.is_nullable),
+            table_name: '',
+            table_schema: '',
+            type: 'tsvector'
+        };
+    }
+    if (functionName === 'ts_rank') {
+        return {
+            column_name: functionName,
+            is_nullable: argsResult.some(col => col.is_nullable),
+            table_name: '',
+            table_schema: '',
+            type: 'float4'
+        };
+    }
+    if (functionName === 'to_tsquery'
         || functionName === 'plainto_tsquery'
         || functionName === 'phraseto_tsquery'
         || functionName === 'websearch_to_tsquery') {
-        return argsResult.every(col => col);
+        return {
+            column_name: functionName,
+            is_nullable: argsResult.some(col => col.is_nullable),
+            table_name: '',
+            table_schema: '',
+            type: 'tsquery'
+        };
     }
     if (functionName === 'to_date') {
-        const firstArg = argsResult[0];
-        return firstArg;
+        return {
+            column_name: functionName,
+            is_nullable: argsResult.some(col => col.is_nullable),
+            table_name: '',
+            table_schema: '',
+            type: 'date'
+        };
     }
     if (functionName === 'generate_series') {
-        return true;
+        return {
+            column_name: functionName,
+            is_nullable: false,
+            table_name: '',
+            table_schema: '',
+            type: 'unknow'
+        };
     }
     if (functionName === 'row_number'
         || functionName === 'rank'
-        || functionName === 'dense_rank'
-        || functionName === 'percent_rank'
+        || functionName === 'dense_rank') {
+        return {
+            column_name: functionName,
+            is_nullable: false,
+            table_name: '',
+            table_schema: '',
+            type: 'int4'
+        };
+    }
+    if (functionName === 'percent_rank'
         || functionName === 'cume_dist') {
-        return true;
+        return {
+            column_name: functionName,
+            is_nullable: false,
+            table_name: '',
+            table_schema: '',
+            type: 'float8'
+        };
     }
     if (functionName === 'first_value'
         || functionName === 'last_value'
@@ -855,18 +1066,51 @@ function traversefunc_application(func_application, context, traverseResult) {
         const firstArg = argsResult[0];
         return firstArg;
     }
-    if (functionName === 'json_build_object'
-        || functionName === 'jsonb_build_object'
-        || functionName === 'json_build_array'
-        || functionName === 'jsonb_build_array'
-        || functionName === 'json_agg'
-        || functionName === 'jsonb_agg') {
-        return true;
+    if (functionName === 'json_build_array'
+        || functionName === 'jsonb_build_array') {
+        return {
+            column_name: functionName,
+            is_nullable: true,
+            table_name: '',
+            table_schema: '',
+            type: 'json[]',
+            jsonType: {
+                name: 'json[]',
+                properties: argsResult.map(arg => arg.jsonType || arg.type)
+            }
+        };
     }
     if (functionName === 'to_json' || functionName === 'to_jsonb') {
-        return argsResult.every(col => col);
+        return {
+            column_name: functionName,
+            is_nullable: true,
+            table_name: '',
+            table_schema: '',
+            type: 'json'
+        };
+    }
+    if (functionName === 'sum') {
+        return Object.assign(Object.assign({}, argsResult[0]), { column_name: functionName, is_nullable: true, type: argsResult[0].type ? mapSumType(argsResult[0].type) : 'unknow' });
+    }
+    return {
+        column_name: functionName,
+        is_nullable: true,
+        table_name: '',
+        table_schema: '',
+        type: 'unknow'
+    };
+}
+function mapSumType(type) {
+    switch (type) {
+        case 'int2':
+        case 'int4':
+            return 'int8';
+        case 'int8':
+        case 'numeric':
+            return 'numeric';
+        default:
+            return type;
     }
-    return false;
 }
 function traversefunc_expr_common_subexpr(func_expr_common_subexpr, context, traverseResult) {
     if (func_expr_common_subexpr.COALESCE() || func_expr_common_subexpr.GREATEST() || func_expr_common_subexpr.LEAST()) {
@@ -875,36 +1119,58 @@ 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 result.some(col => !col.is_nullable);
+        return Object.assign(Object.assign({}, result[0]), { is_nullable: result.every(col => col.is_nullable), table_name: '', table_schema: '' });
     }
     if (func_expr_common_subexpr.EXTRACT()) {
         const a_expr = func_expr_common_subexpr.extract_list().a_expr();
         const result = traverse_a_expr(a_expr, context, traverseResult);
-        return !result.is_nullable;
+        return {
+            column_name: 'extract',
+            is_nullable: result.is_nullable,
+            table_name: '',
+            table_schema: '',
+            type: 'float8'
+        };
     }
     func_expr_common_subexpr.a_expr_list().forEach(a_expr => {
         traverse_a_expr(a_expr, context, traverseResult);
     });
-    return false;
+    return {
+        column_name: func_expr_common_subexpr.getText(),
+        is_nullable: true,
+        table_name: '',
+        table_schema: '',
+        type: 'unknow'
+    };
 }
 function traversefunc_arg_expr(func_arg_expr, context, traverseResult) {
     const a_expr = func_arg_expr.a_expr();
-    return !traverse_a_expr(a_expr, context, traverseResult).is_nullable;
+    return traverse_a_expr(a_expr, context, traverseResult);
 }
 function traverse_array_expr(array_expr, context, traverseResult) {
     const expr_list = array_expr.expr_list();
     if (expr_list) {
-        traverse_expr_list(expr_list, context, traverseResult);
+        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: '' });
     }
     const array_expr_list = array_expr.array_expr_list();
     if (array_expr_list) {
-        traverse_array_expr_list(array_expr_list, context, traverseResult);
+        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 {
+        column_name: array_expr.getText(),
+        is_nullable: true,
+        table_name: '',
+        table_schema: '',
+        type: 'unknow'
+    };
 }
 function traverse_array_expr_list(array_expr_list, context, traverseResult) {
-    array_expr_list.array_expr_list().forEach(array_expr => {
-        traverse_array_expr(array_expr, context, traverseResult);
+    const result = array_expr_list.array_expr_list().map(array_expr => {
+        return traverse_array_expr(array_expr, 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());
@@ -933,11 +1199,12 @@ function traverse_from_list(from_list, context, traverseResult) {
     return newColumns;
 }
 function traverse_table_ref(table_ref, context, traverseResult) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const { fromColumns, dbSchema } = context;
     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, dbSchema);
@@ -953,11 +1220,11 @@ function traverse_table_ref(table_ref, context, traverseResult) {
                 alias: alias,
                 renameAs,
                 parentRelation: '',
-                joinColumn: ((_a = key[0]) === null || _a === void 0 ? void 0 : _a.column_name) || '',
+                joinColumn: ((_c = key[0]) === null || _c === void 0 ? void 0 : _c.column_name) || '',
                 cardinality: 'one',
                 parentCardinality: 'one'
             };
-            (_b = traverseResult.relations) === null || _b === void 0 ? void 0 : _b.push(relation);
+            (_d = traverseResult.relations) === null || _d === void 0 ? void 0 : _d.push(relation);
         }
         const table_ref_list = table_ref.table_ref_list();
         const join_type_list = table_ref.join_type_list();
@@ -990,7 +1257,13 @@ function traverse_table_ref(table_ref, context, traverseResult) {
     const select_with_parens = table_ref.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.map(col => (Object.assign(Object.assign({}, col), { table_name: alias || col.table_name })));
+        const withAlias = 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
+        }));
         return withAlias;
     }
     return allColumns;
@@ -1385,6 +1658,30 @@ function isNotNul_a_expr_unary_qualop(a_expr_unary_qualop, field) {
     }
     return false;
 }
+function mapAddExprType(types) {
+    const arithmeticMatrix = {
+        int2: { int2: 'int2', int4: 'int4', int8: 'int8', float4: 'float4', float8: 'float8', numeric: 'numeric', date: 'date' },
+        int4: { int2: 'int4', int4: 'int4', int8: 'int8', float4: 'float4', float8: 'float8', numeric: 'numeric', date: 'date' },
+        int8: { int2: 'int8', int4: 'int8', int8: 'int8', float4: 'float8', float8: 'float8', numeric: 'numeric', date: 'date' },
+        float4: { int2: 'float4', int4: 'float4', int8: 'float8', float4: 'float4', float8: 'float8', numeric: 'numeric' },
+        float8: { int2: 'float8', int4: 'float8', int8: 'float8', float4: 'float8', float8: 'float8', numeric: 'numeric' },
+        numeric: { int2: 'numeric', int4: 'numeric', int8: 'numeric', float4: 'numeric', float8: 'numeric', numeric: 'numeric' },
+        date: { int2: 'date', int4: 'date', int8: 'date', date: 'int4', /*interval: 'timestamp'*/ }, // date - date = integer
+        timestamp: { /*interval: 'timestamp', timestamp: 'interval'*/},
+        // interval: { date: 'timestamp', interval: 'interval' }
+    };
+    let currentType = 'int2';
+    for (const type of types) {
+        if (type === 'unknow') {
+            return 'unknow';
+        }
+        currentType = arithmeticMatrix[currentType][type];
+        if (!currentType) {
+            return 'unknow';
+        }
+    }
+    return currentType;
+}
 function isNotNull_a_expr_add(a_expr_add, field) {
     const a_expr_mul_list = a_expr_add.a_expr_mul_list();
     if (a_expr_mul_list) {
@@ -1526,7 +1823,7 @@ function getTableName(table_ref) {
 }
 function isAggregateFunction_target_el(target_el) {
     if (target_el instanceof PostgreSQLParser_1.Target_labelContext) {
-        const c_expr_list = collectContextsOfType(target_el, PostgreSQLParser_1.Func_exprContext);
+        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));
         return aggrFunction;
     }