typesql-cli 0.10.0 → 0.10.2

package/sqlite-query-analyzer/sqlite-describe-nested-query.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describeNestedQuery = void 0;
+exports.describeNestedQuery = describeNestedQuery;
 const Either_1 = require("fp-ts/lib/Either");
 function describeNestedQuery(columns, relations) {
     const isJunctionTableMap = new Map();
@@ -14,11 +14,8 @@ function describeNestedQuery(columns, relations) {
     const filterJunctionTables = relations.filter((relation) => !isJunctionTableMap.get(relation.alias || relation.name));
     const result = [];
     for (const [index, relation] of filterJunctionTables.entries()) {
-        const parent = isJunctionTableMap.get(relation.parentRelation)
-            ? parentRef.get(relation.parentRelation)
-            : undefined;
-        const groupIndex = columns.findIndex((col) => col.columnName === relation.joinColumn &&
-            (col.table === relation.name || col.table === relation.alias));
+        const parent = isJunctionTableMap.get(relation.parentRelation) ? parentRef.get(relation.parentRelation) : undefined;
+        const groupIndex = columns.findIndex((col) => col.columnName === relation.joinColumn && (col.table === relation.name || col.table === relation.alias));
         if (groupIndex === -1) {
             const error = {
                 name: 'Error during nested result creation',
@@ -32,9 +29,7 @@ function describeNestedQuery(columns, relations) {
             alias: relation.alias,
             fields: columns
                 .map((item, index) => ({ item, index }))
-                .filter((col) => (parent != null &&
-                (col.item.table === parent.name ||
-                    col.item.table === parent.alias)) ||
+                .filter((col) => (parent != null && (col.item.table === parent.name || col.item.table === parent.alias)) ||
                 col.item.table === relation.name ||
                 col.item.table === relation.alias ||
                 (relation.parentRelation === '' && col.item.table === ''))
@@ -42,30 +37,22 @@ function describeNestedQuery(columns, relations) {
             relations: filterJunctionTables
                 .slice(index + 1)
                 .filter((child) => {
-                const parent = isJunctionTableMap.get(child.parentRelation)
-                    ? parentRef.get(child.parentRelation)
-                    : relation;
-                return (child.parentRelation === parent.name ||
-                    (child.alias !== '' && child.parentRelation === parent.alias));
+                const parent = isJunctionTableMap.get(child.parentRelation) ? parentRef.get(child.parentRelation) : relation;
+                return child.parentRelation === parent.name || (child.alias !== '' && child.parentRelation === parent.alias);
             })
                 .map((relation) => ({
                 name: relation.name,
                 alias: relation.alias,
-                cardinality: isJunctionTableMap.get(relation.parentRelation)
-                    ? 'many'
-                    : relation.cardinality
+                cardinality: isJunctionTableMap.get(relation.parentRelation) ? 'many' : relation.cardinality
             }))
         };
         result.push(relationInfo);
     }
     return (0, Either_1.right)(result);
 }
-exports.describeNestedQuery = describeNestedQuery;
 function isJunctionTable(relation, relations) {
-    const childRelation = relations.find((r) => r.parentRelation === relation.name ||
-        (r.alias !== '' && r.parentRelation === relation.alias));
-    const isJunctionTable = relation.cardinality === 'many' &&
-        (childRelation === null || childRelation === void 0 ? void 0 : childRelation.parentCardinality) === 'many';
+    const childRelation = relations.find((r) => r.parentRelation === relation.name || (r.alias !== '' && r.parentRelation === relation.alias));
+    const isJunctionTable = relation.cardinality === 'many' && (childRelation === null || childRelation === void 0 ? void 0 : childRelation.parentCardinality) === 'many';
     return isJunctionTable;
 }
 //# sourceMappingURL=sqlite-describe-nested-query.js.map

package/sqlite-query-analyzer/sqlite-describe-nested-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"sqlite-describe-nested-query.js","sourceRoot":"","sources":["../../../src/sqlite-query-analyzer/sqlite-describe-nested-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sqlite-describe-nested-query.js","sourceRoot":"","sources":["../../../src/sqlite-query-analyzer/sqlite-describe-nested-query.ts"],"names":[],"mappings":"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"}

package/sqlite-query-analyzer/traverse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traverse.d.ts","sourceRoot":"","sources":["../../../src/sqlite-query-analyzer/traverse.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,WAAW,EAYX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EACX,SAAS,EAET,eAAe,EAGf,MAAM,+BAA+B,CAAC;AASvC,OAAO,EAKN,KAAK,eAAe,EAGpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,KAAK,MAAM,EAAe,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AA8B7C,wBAAgB,2BAA2B,CAC1C,QAAQ,EAAE,eAAe,EACzB,eAAe,EAAE,eAAe,GAC9B,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,CAWvC;AAgzCD,wBAAgB,SAAS,CACxB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,WAAW,GAAG,IAAI,GACvB,OAAO,CAmBT;AAgCD,wBAAgB,mBAAmB,CAClC,WAAW,EAAE,kBAAkB,EAC/B,WAAW,EAAE,SAAS,EAAE,WAmCxB"}
+{"version":3,"file":"traverse.d.ts","sourceRoot":"","sources":["../../../src/sqlite-query-analyzer/traverse.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,WAAW,EAYX,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAa,eAAe,EAA2C,MAAM,+BAA+B,CAAC;AAGpI,OAAO,EAKN,KAAK,eAAe,EAGpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,KAAK,MAAM,EAAe,MAAM,kBAAkB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AA2B7C,wBAAgB,2BAA2B,CAC1C,QAAQ,EAAE,eAAe,EACzB,eAAe,EAAE,eAAe,GAC9B,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,CAWvC;AA6rCD,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,CAehF;AA8BD,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,EAAE,WAAW,EAAE,SAAS,EAAE,WA2B5F"}

package/sqlite-query-analyzer/traverse.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMultipleRowResult = exports.isNotNull = exports.tryTraverse_Sql_stmtContext = void 0;
+exports.tryTraverse_Sql_stmtContext = tryTraverse_Sql_stmtContext;
+exports.isNotNull = isNotNull;
+exports.isMultipleRowResult = isMultipleRowResult;
 const sqlite_1 = require("@wsporto/ts-mysql-parser/dist/sqlite");
 const select_columns_1 = require("../mysql-query-analyzer/select-columns");
 const collect_constraints_1 = require("../mysql-query-analyzer/collect-constraints");
@@ -42,7 +44,6 @@ function tryTraverse_Sql_stmtContext(sql_stmt, traverseContext) {
         });
     }
 }
-exports.tryTraverse_Sql_stmtContext = tryTraverse_Sql_stmtContext;
 function traverse_select_stmt(select_stmt, traverseContext, subQuery = false, recursive = false, recursiveNames = []) {
     const common_table_stmt = select_stmt.common_table_stmt();
     if (common_table_stmt) {
@@ -50,16 +51,14 @@ function traverse_select_stmt(select_stmt, traverseContext, subQuery = false, re
         const common_table_expression = common_table_stmt.common_table_expression_list();
         common_table_expression.forEach((common_table_expression) => {
             const table_name = common_table_expression.table_name();
-            const recursiveNames = common_table_expression
-                .column_name_list()
-                .map((column_name) => column_name.getText());
+            const recursiveNames = common_table_expression.column_name_list().map((column_name) => column_name.getText());
             const select_stmt = common_table_expression.select_stmt();
             const select_stmt_result = traverse_select_stmt(select_stmt, Object.assign(Object.assign({}, traverseContext), { subQuery: true }), subQuery, recursive, recursiveNames);
             select_stmt_result.columns.forEach((col, index) => {
                 var _a;
                 traverseContext.withSchema.push({
                     table: table_name.getText(),
-                    columnName: recursive ? (_a = recursiveNames[index]) !== null && _a !== void 0 ? _a : col.name : col.name,
+                    columnName: recursive ? ((_a = recursiveNames[index]) !== null && _a !== void 0 ? _a : col.name) : col.name,
                     columnType: col.type,
                     columnKey: '',
                     notNull: col.notNull
@@ -109,7 +108,7 @@ function traverse_select_stmt(select_stmt, traverseContext, subQuery = false, re
                 hasOrderByParameter = true;
             }
             else {
-                traverse_expr(expr, Object.assign(Object.assign({}, traverseContext), { fromColumns: fromColumns.concat(selectColumns) }));
+                traverse_expr(expr, Object.assign(Object.assign({}, traverseContext), { fromColumns: mainQueryResult.fromColumns.concat(selectColumns) }));
             }
         });
         if (hasOrderByParameter) {
@@ -177,9 +176,7 @@ function traverse_select_core(select_core, traverseContext, subQuery = false, re
         columnsResult.push(...fields);
     }
     const result_column = select_core.result_column_list();
-    const fromColumns = subQuery || recursive
-        ? traverseContext.fromColumns.concat(columnsResult)
-        : columnsResult;
+    const fromColumns = subQuery || recursive ? traverseContext.fromColumns.concat(columnsResult) : columnsResult;
     result_column.forEach((result_column) => {
         var _a, _b;
         if (result_column.STAR()) {
@@ -210,9 +207,7 @@ function traverse_select_core(select_core, traverseContext, subQuery = false, re
             const exprType = traverse_expr(expr, Object.assign(Object.assign({}, traverseContext), { fromColumns: fromColumns }));
             if (alias) {
                 traverseContext.relations
-                    .filter((relation) => relation.joinColumn === exprType.name &&
-                    (relation.name === exprType.table ||
-                        relation.alias === exprType.table))
+                    .filter((relation) => relation.joinColumn === exprType.name && (relation.name === exprType.table || relation.alias === exprType.table))
                     .forEach((relation) => {
                     relation.joinColumn = alias;
                 });
@@ -266,9 +261,7 @@ function traverse_select_core(select_core, traverseContext, subQuery = false, re
         traverse_expr(havingExpr, Object.assign(Object.assign({}, traverseContext), { fromColumns: newColumns.concat(fromColumns) }));
     }
     const querySpecification = {
-        columns: listType.map((col) => (Object.assign(Object.assign({}, col), { notNull: col.notNull ||
-                isNotNull(col.name, whereExpr) ||
-                isNotNull(col.name, havingExpr) }))),
+        columns: listType.map((col) => (Object.assign(Object.assign({}, col), { notNull: col.notNull || isNotNull(col.name, whereExpr) || isNotNull(col.name, havingExpr) }))),
         fromColumns: columnsResult //TODO - return isMultipleRowResult instead
     };
     return querySpecification;
@@ -279,7 +272,7 @@ function extractRelationsAndParams(expr, fromColumns, parameters) {
         .filter((expr) => !expr.isSubQuery)
         .map((colRef) => {
         const fieldName = (0, select_columns_1.splitName)(colRef.expr.parentCtx.getText());
-        const column = (0, select_columns_1.findColumn)(fieldName, fromColumns);
+        const column = (0, select_columns_1.findColumnOrVT)(fieldName, fromColumns);
         return column.tableAlias || column.table;
     });
     const expressionList = (0, select_columns_1.getExpressions)(expr, sqlite_1.ExprContext);
@@ -297,9 +290,7 @@ function traverse_table_or_subquery(table_or_subquery_list, join_constraint_list
     table_or_subquery_list.forEach((table_or_subquery, index) => {
         var _a, _b, _c, _d, _e;
         const numParamsBefore = traverseContext.parameters.length;
-        const isLeftJoin = index > 0 && join_operator_list
-            ? ((_a = join_operator_list[index - 1]) === null || _a === void 0 ? void 0 : _a.LEFT_()) != null
-            : false;
+        const isLeftJoin = index > 0 && join_operator_list ? ((_a = join_operator_list[index - 1]) === null || _a === void 0 ? void 0 : _a.LEFT_()) != null : false;
         const table_name = table_or_subquery.table_name();
         const table_alias_temp = ((_b = table_or_subquery.table_alias()) === null || _b === void 0 ? void 0 : _b.getText()) || '';
         let tableOrSubqueryFields = [];
@@ -312,14 +303,10 @@ function traverse_table_or_subquery(table_or_subquery_list, join_constraint_list
             table_alias_temp.toLowerCase() === 'cross'
             ? ''
             : table_alias_temp;
-        const join_constraint = join_constraint_list && index > 0
-            ? join_constraint_list[index - 1]
-            : undefined;
+        const join_constraint = join_constraint_list && index > 0 ? join_constraint_list[index - 1] : undefined;
         const asAlias = table_or_subquery.AS_() || false;
         const tableAlias = (_c = table_or_subquery.table_alias()) === null || _c === void 0 ? void 0 : _c.getText();
-        const tableOrSubqueryName = table_name
-            ? table_name.any_name().getText()
-            : '';
+        const tableOrSubqueryName = table_name ? table_name.any_name().getText() : '';
         const schema = ((_d = table_or_subquery.schema_name()) === null || _d === void 0 ? void 0 : _d.getText()) || '';
         if (table_name) {
             const tableName = {
@@ -327,12 +314,8 @@ function traverse_table_or_subquery(table_or_subquery_list, join_constraint_list
                 prefix: schema
             };
             tableOrSubqueryFields = (0, select_columns_1.filterColumns)(traverseContext.dbSchema, traverseContext.withSchema, table_alias, tableName);
-            const usingFields = (join_constraint === null || join_constraint === void 0 ? void 0 : join_constraint.USING_())
-                ? join_constraint === null || join_constraint === void 0 ? void 0 : join_constraint.column_name_list().map((column_name) => column_name.getText())
-                : [];
-            const filteredFields = usingFields.length > 0
-                ? filterUsingFields(tableOrSubqueryFields, usingFields)
-                : tableOrSubqueryFields;
+            const usingFields = (join_constraint === null || join_constraint === void 0 ? void 0 : join_constraint.USING_()) ? join_constraint === null || join_constraint === void 0 ? void 0 : join_constraint.column_name_list().map((column_name) => column_name.getText()) : [];
+            const filteredFields = usingFields.length > 0 ? filterUsingFields(tableOrSubqueryFields, usingFields) : tableOrSubqueryFields;
             if (isLeftJoin) {
                 allFields.push(...filteredFields.map((field) => (Object.assign(Object.assign({}, field), { notNull: false }))));
             }
@@ -377,24 +360,17 @@ function traverse_table_or_subquery(table_or_subquery_list, join_constraint_list
                 traverse_expr(expr, Object.assign(Object.assign({}, traverseContext), { fromColumns: allFields }));
                 const allJoinColumsn = getAllColumns(expr);
                 allJoinColumsn.forEach((joinColumn) => {
-                    const column = allFields.find((col) => col.columnName === joinColumn.name &&
-                        (col.tableAlias === joinColumn.prefix ||
-                            col.table === joinColumn.prefix));
-                    const filterUniqueKeys = allFields.filter((col) => (joinColumn.prefix === col.table ||
-                        joinColumn.prefix === col.tableAlias) &&
-                        col.columnKey === 'PRI');
+                    const column = allFields.find((col) => col.columnName === joinColumn.name && (col.tableAlias === joinColumn.prefix || col.table === joinColumn.prefix));
+                    const filterUniqueKeys = allFields.filter((col) => (joinColumn.prefix === col.table || joinColumn.prefix === col.tableAlias) && col.columnKey === 'PRI');
                     const compositeKey = filterUniqueKeys.find((uni) => uni.columnName === column.columnName);
-                    const notUnique = (filterUniqueKeys.length > 1 && compositeKey) ||
-                        ((column === null || column === void 0 ? void 0 : column.columnKey) !== 'UNI' && (column === null || column === void 0 ? void 0 : column.columnKey) !== 'PRI');
-                    if (joinColumn.prefix !== relation.name &&
-                        joinColumn.prefix !== relation.alias) {
+                    const notUnique = (filterUniqueKeys.length > 1 && compositeKey) || ((column === null || column === void 0 ? void 0 : column.columnKey) !== 'UNI' && (column === null || column === void 0 ? void 0 : column.columnKey) !== 'PRI');
+                    if (joinColumn.prefix !== relation.name && joinColumn.prefix !== relation.alias) {
                         relation.parentRelation = joinColumn.prefix;
                         if (notUnique) {
                             relation.parentCardinality = 'many';
                         }
                     }
-                    if (joinColumn.prefix === relation.name ||
-                        joinColumn.prefix === relation.alias) {
+                    if (joinColumn.prefix === relation.name || joinColumn.prefix === relation.alias) {
                         if (notUnique) {
                             relation.cardinality = 'many';
                         }
@@ -405,12 +381,8 @@ function traverse_table_or_subquery(table_or_subquery_list, join_constraint_list
         if (!traverseContext.subQuery) {
             traverseContext.relations.push(relation);
             //dynamic query
-            const fragment = `${join_operator_list != null && index > 0
-                ? extractOriginalSql(join_operator_list[index - 1])
-                : 'FROM'} ${extractOriginalSql(table_or_subquery_list[index])}${join_constraint != null ? ` ${extractOriginalSql(join_constraint)}` : ''}`;
-            const params = traverseContext.parameters
-                .slice(numParamsBefore)
-                .map((_, index) => index + numParamsBefore);
+            const fragment = `${join_operator_list != null && index > 0 ? extractOriginalSql(join_operator_list[index - 1]) : 'FROM'} ${extractOriginalSql(table_or_subquery_list[index])}${join_constraint != null ? ` ${extractOriginalSql(join_constraint)}` : ''}`;
+            const params = traverseContext.parameters.slice(numParamsBefore).map((_, index) => index + numParamsBefore);
             traverseContext.dynamicSqlInfo2.from.push({
                 fragment: fragment,
                 relationName: relation.name,
@@ -606,9 +578,7 @@ function traverse_expr(expr, traverseContext) {
             table: functionType.table || ''
         };
     }
-    if (function_name === 'date' ||
-        function_name === 'time' ||
-        function_name === 'datetime') {
+    if (function_name === 'date' || function_name === 'time' || function_name === 'datetime') {
         const functionType = (0, collect_constraints_1.freshVar)(expr.getText(), 'DATE');
         const paramExpr = expr.expr(0);
         const paramType = traverse_expr(paramExpr, traverseContext);
@@ -680,9 +650,7 @@ function traverse_expr(expr, traverseContext) {
             table: functionType.table || ''
         };
     }
-    if (function_name === 'row_number' ||
-        function_name === 'rank' ||
-        function_name === 'dense_rank') {
+    if (function_name === 'row_number' || function_name === 'rank' || function_name === 'dense_rank') {
         const functionType = (0, collect_constraints_1.freshVar)(expr.getText(), 'INTEGER');
         return {
             name: functionType.name,
@@ -868,8 +836,7 @@ function traverse_expr(expr, traverseContext) {
             type1: returnType,
             type2: typeLeft.type
         });
-        const isDateFunctionContext = expr.parentCtx instanceof sqlite_1.ExprContext &&
-            ((_b = expr.parentCtx.function_name()) === null || _b === void 0 ? void 0 : _b.getText().toLowerCase()) === 'date';
+        const isDateFunctionContext = expr.parentCtx instanceof sqlite_1.ExprContext && ((_b = expr.parentCtx.function_name()) === null || _b === void 0 ? void 0 : _b.getText().toLowerCase()) === 'date';
         if (!isDateFunctionContext) {
             traverseContext.constraints.push({
                 expression: exprRight.getText(),
@@ -1077,6 +1044,22 @@ function traverse_expr(expr, traverseContext) {
             table: type.table || ''
         };
     }
+    if (expr.MATCH_()) {
+        const exprLeft = expr.expr(0);
+        const exprRight = expr.expr(1);
+        const typeRight = traverse_expr(exprRight, traverseContext);
+        if (typeRight.name === '?') {
+            typeRight.notNull = true;
+            typeRight.type = (0, collect_constraints_1.freshVar)(exprRight.getText(), 'TEXT');
+        }
+        const type = (0, collect_constraints_1.freshVar)(expr.getText(), 'INTEGER');
+        return {
+            name: type.name,
+            type: type,
+            notNull: true,
+            table: type.table || ''
+        };
+    }
     const select_stmt = expr.select_stmt();
     if (select_stmt) {
         const subQueryType = traverse_select_stmt(select_stmt, Object.assign(Object.assign({}, traverseContext), { subQuery: true }), true);
@@ -1111,8 +1094,7 @@ function traverse_expr(expr, traverseContext) {
         const whenTypes = [];
         expr.expr_list().forEach((expr_, index) => {
             const type = traverse_expr(expr_, traverseContext);
-            if (index % 2 === 0 &&
-                (!expr.ELSE_() || index < expr.expr_list().length - 1)) {
+            if (index % 2 === 0 && (!expr.ELSE_() || index < expr.expr_list().length - 1)) {
                 whenTypes.push(type);
             }
             else {
@@ -1157,7 +1139,7 @@ function traverse_column_name(column_name, table_name, traverseContext) {
         name: column_name.getText(),
         prefix: (table_name === null || table_name === void 0 ? void 0 : table_name.getText()) || ''
     };
-    const column = (0, select_columns_1.findColumn)(fieldName, traverseContext.fromColumns);
+    const column = (0, select_columns_1.findColumnOrVT)(fieldName, traverseContext.fromColumns);
     // const typeVar = freshVar(column.columnName, column.columnType.type, column.tableAlias || column.table);
     return column;
 }
@@ -1166,22 +1148,17 @@ function isNotNull(columnName, where) {
         return false;
     }
     if (where.AND_()) {
-        const ifNullList = where
-            .expr_list()
-            .map((expr) => isNotNull(columnName, expr));
+        const ifNullList = where.expr_list().map((expr) => isNotNull(columnName, expr));
         const result = ifNullList.some((v) => v);
         return result;
     }
     if (where.OR_()) {
-        const possibleNullList = where
-            .expr_list()
-            .map((expr) => isNotNull(columnName, expr));
+        const possibleNullList = where.expr_list().map((expr) => isNotNull(columnName, expr));
         const result = possibleNullList.every((v) => v);
         return result;
     }
     return isNotNullExpr(columnName, where);
 }
-exports.isNotNull = isNotNull;
 function isNotNullExpr(columnName, expr) {
     if (expr.OPEN_PAR() && expr.CLOSE_PAR()) {
         const innerExpr = expr.expr(0);
@@ -1192,9 +1169,7 @@ function isNotNullExpr(columnName, expr) {
         expr.GT_EQ() ||
         expr.LT() ||
         expr.LT_EQ() ||
-        (expr.IS_() &&
-            expr.expr_list().length === 2 &&
-            expr.expr(1).getText() === 'notnull')) {
+        (expr.IS_() && expr.expr_list().length === 2 && expr.expr(1).getText() === 'notnull')) {
         const exprLeft = expr.expr(0);
         const exprRight = expr.expr(1);
         const column_name_left = exprLeft.column_name();
@@ -1217,22 +1192,16 @@ function isMultipleRowResult(select_stmt, fromColumns) {
         if (!from) {
             return false;
         }
-        const groupBy = select_stmt
-            .select_core_list()
-            .some((select_core) => select_core.GROUP_() != null);
+        const groupBy = select_stmt.select_core_list().some((select_core) => select_core.GROUP_() != null);
         if (groupBy) {
             return true;
         }
-        const agreegateFunction = select_core
-            .result_column_list()
-            .some((result_column) => isAgregateFunction(result_column));
+        const agreegateFunction = select_core.result_column_list().some((result_column) => isAgregateFunction(result_column));
         if (agreegateFunction) {
             return false;
         }
         const _whereExpr = select_core._whereExpr;
-        const isSingleResult = select_core.join_clause() == null &&
-            _whereExpr &&
-            where_is_single_result(_whereExpr, fromColumns);
+        const isSingleResult = select_core.join_clause() == null && _whereExpr && where_is_single_result(_whereExpr, fromColumns);
         if (isSingleResult === true) {
             return false;
         }
@@ -1242,7 +1211,6 @@ function isMultipleRowResult(select_stmt, fromColumns) {
     }
     return true;
 }
-exports.isMultipleRowResult = isMultipleRowResult;
 function isAgregateFunction(result_column) {
     var _a;
     if (((_a = result_column.expr()) === null || _a === void 0 ? void 0 : _a.over_clause()) != null) {
@@ -1321,9 +1289,7 @@ function traverse_insert_stmt(insert_stmt, traverseContext) {
                     type1: col.columnType,
                     type2: exprType.type
                 });
-                const notNullColumn = col.columnKey === 'PRI' && col.columnType.type === 'INTEGER'
-                    ? false
-                    : col.notNull;
+                const notNullColumn = col.columnKey === 'PRI' && col.columnType.type === 'INTEGER' ? false : col.notNull;
                 insertColumns.push(Object.assign(Object.assign({}, param), { notNull: exprType.name === '?' ? notNullColumn : param.notNull }));
             });
         });
@@ -1339,15 +1305,11 @@ function traverse_insert_stmt(insert_stmt, traverseContext) {
                 type1: col.columnType,
                 type2: selectColumn.type
             });
-            const notNullColumn = col.columnKey === 'PRI' && col.columnType.type === 'INTEGER'
-                ? false
-                : col.notNull;
+            const notNullColumn = col.columnKey === 'PRI' && col.columnType.type === 'INTEGER' ? false : col.notNull;
             columnNullability.set(selectColumn.type.id, notNullColumn);
         });
         traverseContext.parameters.forEach((param) => {
-            insertColumns.push(Object.assign(Object.assign({}, param), { notNull: columnNullability.get(param.type.id) != null
-                    ? columnNullability.get(param.type.id)
-                    : param.notNull }));
+            insertColumns.push(Object.assign(Object.assign({}, param), { notNull: columnNullability.get(param.type.id) != null ? columnNullability.get(param.type.id) : param.notNull }));
         });
     }
     const upsert_clause = insert_stmt.upsert_clause();
@@ -1359,9 +1321,7 @@ function traverse_insert_stmt(insert_stmt, traverseContext) {
             const col = traverse_column_name(column_name, null, Object.assign(Object.assign({}, traverseContext), { fromColumns }));
             const expr = upsert_clause.expr(index);
             const table_name = expr.table_name();
-            const excludedColumns = table_name && table_name.getText() === 'excluded'
-                ? fromColumns.map((col) => (Object.assign(Object.assign({}, col), { table: 'excluded' })))
-                : [];
+            const excludedColumns = table_name && table_name.getText() === 'excluded' ? fromColumns.map((col) => (Object.assign(Object.assign({}, col), { table: 'excluded' }))) : [];
             const exprType = traverse_expr(expr, Object.assign(Object.assign({}, traverseContext), { fromColumns: fromColumns.concat(excludedColumns) }));
             traverseContext.constraints.push({
                 expression: column_name.getText(),
@@ -1374,9 +1334,7 @@ function traverse_insert_stmt(insert_stmt, traverseContext) {
         });
     }
     const returning_clause = insert_stmt.returning_clause();
-    const returninColumns = returning_clause
-        ? traverse_returning_clause(returning_clause, fromColumns)
-        : [];
+    const returninColumns = returning_clause ? traverse_returning_clause(returning_clause, fromColumns) : [];
     const queryResult = {
         queryType: 'Insert',
         constraints: traverseContext.constraints,
@@ -1420,8 +1378,7 @@ function traverse_update_stmt(update_stmt, traverseContext) {
     expr_list.forEach((expr, index) => {
         paramsBefore = traverseContext.parameters.length;
         const exprType = traverse_expr(expr, Object.assign(Object.assign({}, traverseContext), { fromColumns }));
-        if (!update_stmt.WHERE_() ||
-            expr.start.start < update_stmt.WHERE_().symbol.start) {
+        if (!update_stmt.WHERE_() || expr.start.start < update_stmt.WHERE_().symbol.start) {
             const col = columns[index];
             traverseContext.constraints.push({
                 expression: expr.getText(),