typesql-cli 0.4.11 → 0.5.1

package/mysql-query-analyzer/collect-constraints.d.ts

@@ -26,6 +26,7 @@ export type Constraint = {
 };
 export type InferenceContext = {
     dbSchema: ColumnSchema[];
+    withSchema: ColumnSchema[];
     parameters: TypeVar[];
     constraints: Constraint[];
     fromColumns: ColumnDef[];
@@ -34,16 +35,16 @@ export declare function freshVar(name: string, typeVar: InferType, selectItem?:
 export type NamedNodes = {
     [key: string]: Type;
 };
-export declare function analiseTree(tree: RuleContext, dbSchema: ColumnSchema[], namedParameters: string[]): TypeInferenceResult;
-export declare function analiseInsertStatement(insertStatement: InsertStatementContext, dbSchema: ColumnSchema[]): InsertInfoResult;
-export declare function analiseDeleteStatement(deleteStatement: DeleteStatementContext, dbSchema: ColumnSchema[]): DeleteInfoResult;
-export declare function analiseUpdateStatement(updateStatement: UpdateStatementContext, dbSchema: ColumnSchema[]): UpdateInfoResult;
+export declare function analiseTree(tree: RuleContext, dbSchema: ColumnSchema[], withSchema: ColumnSchema[], namedParameters: string[]): TypeInferenceResult;
+export declare function analiseInsertStatement(insertStatement: InsertStatementContext, dbSchema: ColumnSchema[], withSchema: ColumnSchema[]): InsertInfoResult;
+export declare function analiseDeleteStatement(deleteStatement: DeleteStatementContext, dbSchema: ColumnSchema[], withSchema: ColumnSchema[]): DeleteInfoResult;
+export declare function analiseUpdateStatement(updateStatement: UpdateStatementContext, dbSchema: ColumnSchema[], withSchema: ColumnSchema[]): UpdateInfoResult;
 export declare function getInsertColumns(insertStatement: InsertStatementContext, dbSchema: ColumnSchema[]): ColumnSchema[];
 export declare function getUpdateColumns(updateStatement: UpdateStatementContext, dbSchema: ColumnSchema[]): ColumnDef[];
 export declare function getDeleteColumns(deleteStatement: DeleteStatementContext, dbSchema: ColumnSchema[]): ColumnDef[];
-export declare function analiseSelectStatement(selectStatement: SelectStatementContext | SubqueryContext, dbSchema: ColumnSchema[], namedParameters: string[]): TypeInferenceResult;
-export declare function unionTypeResult(type1: InferType, type2: InferType): InferType;
-export declare function analiseQuerySpecification(querySpec: QuerySpecificationContext, dbSchema: ColumnSchema[], namedParameters: string[], fromColumns: ColumnDef[]): TypeInferenceResult;
+export declare function analiseSelectStatement(selectStatement: SelectStatementContext | SubqueryContext, dbSchema: ColumnSchema[], withSchema: ColumnSchema[], namedParameters: string[]): TypeInferenceResult;
+export declare function unionTypeResult(type1: InferType, type2: InferType): any;
+export declare function analiseQuerySpecification(querySpec: QuerySpecificationContext, dbSchema: ColumnSchema[], withSchema: ColumnSchema[], namedParameters: string[], fromColumns: ColumnDef[]): TypeInferenceResult;
 export declare function generateTypeInfo(namedNodes: TypeVar[], constraints: Constraint[]): InferType[];
 export declare function walkQuerySpecification(context: InferenceContext, querySpec: QuerySpecificationContext): TypeOperator;
 export declare function walkSubquery(context: InferenceContext, queryExpressionParens: SubqueryContext): Type;

package/mysql-query-analyzer/collect-constraints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collect-constraints.d.ts","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/collect-constraints.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"collect-constraints.d.ts","sourceRoot":"","sources":["../../../src/mysql-query-analyzer/collect-constraints.ts"],"names":[],"mappings":"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"}

package/mysql-query-analyzer/collect-constraints.js

@@ -29,16 +29,16 @@ function freshVar(name, typeVar, selectItem, list) {
     return param;
 }
 exports.freshVar = freshVar;
-function analiseTree(tree, dbSchema, namedParameters) {
+function analiseTree(tree, dbSchema, withSchema, namedParameters) {
     var _a, _b, _c;
     if (tree instanceof ts_mysql_parser_1.QueryContext) {
         const selectStatement = (_a = tree.simpleStatement()) === null || _a === void 0 ? void 0 : _a.selectStatement();
         if (selectStatement) {
-            return analiseSelectStatement(selectStatement, dbSchema, namedParameters);
+            return analiseSelectStatement(selectStatement, dbSchema, withSchema, namedParameters);
         }
         const insertStatement = (_b = tree.simpleStatement()) === null || _b === void 0 ? void 0 : _b.insertStatement();
         if (insertStatement) {
-            const insertStmt = analiseInsertStatement(insertStatement, dbSchema);
+            const insertStmt = analiseInsertStatement(insertStatement, dbSchema, withSchema);
             const TypeInfer = {
                 columns: [],
                 parameters: insertStmt.parameters.map(param => param.columnType)
@@ -47,7 +47,7 @@ function analiseTree(tree, dbSchema, namedParameters) {
         }
         const updateStatement = (_c = tree.simpleStatement()) === null || _c === void 0 ? void 0 : _c.updateStatement();
         if (updateStatement) {
-            const updateStmt = analiseUpdateStatement(updateStatement, dbSchema);
+            const updateStmt = analiseUpdateStatement(updateStatement, dbSchema, withSchema);
             const TypeInfer = {
                 columns: [],
                 parameters: updateStmt.data.map(param => param.columnType)
@@ -58,7 +58,7 @@ function analiseTree(tree, dbSchema, namedParameters) {
     throw Error('invalid type of tree');
 }
 exports.analiseTree = analiseTree;
-function analiseInsertStatement(insertStatement, dbSchema) {
+function analiseInsertStatement(insertStatement, dbSchema, withSchema) {
     const valuesContext = insertStatement.insertFromConstructor().insertValues().valueList().values()[0];
     const insertColumns = getInsertColumns(insertStatement, dbSchema);
     const allParameters = [];
@@ -74,6 +74,7 @@ function analiseInsertStatement(insertStatement, dbSchema) {
     exprOrDefaultList.forEach((expr, index) => {
         const context = {
             dbSchema,
+            withSchema,
             constraints: [],
             parameters: [],
             fromColumns: []
@@ -103,7 +104,7 @@ function analiseInsertStatement(insertStatement, dbSchema) {
     return typeInferenceResult;
 }
 exports.analiseInsertStatement = analiseInsertStatement;
-function analiseDeleteStatement(deleteStatement, dbSchema) {
+function analiseDeleteStatement(deleteStatement, dbSchema, withSchema) {
     var _a;
     const whereExpr = (_a = deleteStatement.whereClause()) === null || _a === void 0 ? void 0 : _a.expr();
     const deleteColumns = getDeleteColumns(deleteStatement, dbSchema);
@@ -113,7 +114,8 @@ function analiseDeleteStatement(deleteStatement, dbSchema) {
             fromColumns: deleteColumns,
             parameters: [],
             constraints: [],
-            dbSchema
+            dbSchema,
+            withSchema
         };
         walkExpr(context, whereExpr);
         const typeInfo = generateTypeInfo(context.parameters, context.constraints);
@@ -133,7 +135,7 @@ function analiseDeleteStatement(deleteStatement, dbSchema) {
     return typeInferenceResult;
 }
 exports.analiseDeleteStatement = analiseDeleteStatement;
-function analiseUpdateStatement(updateStatement, dbSchema) {
+function analiseUpdateStatement(updateStatement, dbSchema, withSchema) {
     var _a;
     const updateElement = updateStatement.updateList().updateElement();
     const updateColumns = getUpdateColumns(updateStatement, dbSchema);
@@ -144,6 +146,7 @@ function analiseUpdateStatement(updateStatement, dbSchema) {
         if (expr) {
             const context = {
                 dbSchema,
+                withSchema,
                 parameters: [],
                 constraints: [],
                 fromColumns: updateColumns
@@ -171,6 +174,7 @@ function analiseUpdateStatement(updateStatement, dbSchema) {
     if (whereExpr) {
         const context = {
             dbSchema,
+            withSchema,
             parameters: [],
             constraints: [],
             fromColumns: updateColumns
@@ -254,14 +258,14 @@ function getDeleteColumns(deleteStatement, dbSchema) {
     return columns;
 }
 exports.getDeleteColumns = getDeleteColumns;
-function analiseSelectStatement(selectStatement, dbSchema, namedParameters) {
+function analiseSelectStatement(selectStatement, dbSchema, withSchema, namedParameters) {
     const querySpec = (0, parse_1.getQuerySpecificationsFromSelectStatement)(selectStatement);
-    const fromColumns = (0, select_columns_1.getColumnsFrom)(querySpec[0], dbSchema);
-    let result = analiseQuerySpecification(querySpec[0], dbSchema, namedParameters, fromColumns);
+    const fromColumns = (0, select_columns_1.getColumnsFrom)(querySpec[0], dbSchema, withSchema);
+    let result = analiseQuerySpecification(querySpec[0], dbSchema, dbSchema, namedParameters, fromColumns);
     for (let index = 1; index < querySpec.length; index++) {
         const unionQuery = querySpec[index];
-        const fromColumns2 = (0, select_columns_1.getColumnsFrom)(unionQuery, dbSchema);
-        const result2 = analiseQuerySpecification(unionQuery, dbSchema, namedParameters, fromColumns2);
+        const fromColumns2 = (0, select_columns_1.getColumnsFrom)(unionQuery, dbSchema, withSchema);
+        const result2 = analiseQuerySpecification(unionQuery, dbSchema, dbSchema, namedParameters, fromColumns2);
         result = unionResult(result, result2);
     }
     return result;
@@ -279,16 +283,455 @@ function unionResult(typeInference1, typeInference2) {
     };
 }
 function unionTypeResult(type1, type2) {
-    const typeOrder = ['tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'float', 'double', 'varchar'];
-    const indexType1 = typeOrder.indexOf(type1);
-    const indexType2 = typeOrder.indexOf(type2);
-    const max = Math.max(indexType1, indexType2);
-    return typeOrder[max];
+    //Gernerated with tests\check-mysql-inference.ts
+    const typeMapping = {
+        "decimal_tinyint": "decimal",
+        "decimal_smallint": "decimal",
+        "decimal_int": "decimal",
+        "decimal_float": "double",
+        "decimal_double": "double",
+        "decimal_timestamp": "varchar",
+        "decimal_bigint": "decimal",
+        "decimal_mediumint": "decimal",
+        "decimal_date": "varchar",
+        "decimal_time": "varchar",
+        "decimal_datetime": "varchar",
+        "decimal_year": "decimal",
+        "decimal_varchar": "varchar",
+        "decimal_bit": "decimal",
+        "decimal_json": "varbinary",
+        "decimal_enum": "varchar",
+        "decimal_set": "varchar",
+        "decimal_tinyblob": "text",
+        "decimal_mediumblob": "text",
+        "decimal_longblob": "longtext",
+        "decimal_blob": "text",
+        "decimal_tinytext": "text",
+        "decimal_mediumtext": "text",
+        "decimal_longtext": "longtext",
+        "decimal_text": "text",
+        "decimal_varbinary": "varbinary",
+        "decimal_binary": "binary",
+        "decimal_char": "binary",
+        "decimal_geometry": "varbinary",
+        "tinyint_smallint": "smallint",
+        "tinyint_int": "int",
+        "tinyint_float": "float",
+        "tinyint_double": "double",
+        "tinyint_timestamp": "varchar",
+        "tinyint_bigint": "bigint",
+        "tinyint_mediumint": "mediumint",
+        "tinyint_date": "varchar",
+        "tinyint_time": "varchar",
+        "tinyint_datetime": "varchar",
+        "tinyint_year": "tinyint",
+        "tinyint_varchar": "varchar",
+        "tinyint_bit": "decimal",
+        "tinyint_json": "varbinary",
+        "tinyint_enum": "varchar",
+        "tinyint_set": "varchar",
+        "tinyint_tinyblob": "text",
+        "tinyint_mediumblob": "text",
+        "tinyint_longblob": "longtext",
+        "tinyint_blob": "text",
+        "tinyint_tinytext": "text",
+        "tinyint_mediumtext": "text",
+        "tinyint_longtext": "longtext",
+        "tinyint_text": "text",
+        "tinyint_varbinary": "varbinary",
+        "tinyint_binary": "binary",
+        "tinyint_char": "binary",
+        "tinyint_geometry": "varbinary",
+        "smallint_int": "int",
+        "smallint_float": "float",
+        "smallint_double": "double",
+        "smallint_timestamp": "varchar",
+        "smallint_bigint": "bigint",
+        "smallint_mediumint": "mediumint",
+        "smallint_date": "varchar",
+        "smallint_time": "varchar",
+        "smallint_datetime": "varchar",
+        "smallint_year": "smallint",
+        "smallint_varchar": "varchar",
+        "smallint_bit": "decimal",
+        "smallint_json": "varbinary",
+        "smallint_enum": "varchar",
+        "smallint_set": "varchar",
+        "smallint_tinyblob": "text",
+        "smallint_mediumblob": "text",
+        "smallint_longblob": "longtext",
+        "smallint_blob": "text",
+        "smallint_tinytext": "text",
+        "smallint_mediumtext": "text",
+        "smallint_longtext": "longtext",
+        "smallint_text": "text",
+        "smallint_varbinary": "varbinary",
+        "smallint_binary": "binary",
+        "smallint_char": "binary",
+        "smallint_geometry": "varbinary",
+        "int_float": "double",
+        "int_double": "double",
+        "int_timestamp": "varchar",
+        "int_bigint": "bigint",
+        "int_mediumint": "int",
+        "int_date": "varchar",
+        "int_time": "varchar",
+        "int_datetime": "varchar",
+        "int_year": "int",
+        "int_varchar": "varchar",
+        "int_bit": "decimal",
+        "int_json": "varbinary",
+        "int_enum": "varchar",
+        "int_set": "varchar",
+        "int_tinyblob": "text",
+        "int_mediumblob": "text",
+        "int_longblob": "longtext",
+        "int_blob": "text",
+        "int_tinytext": "text",
+        "int_mediumtext": "text",
+        "int_longtext": "longtext",
+        "int_text": "text",
+        "int_varbinary": "varbinary",
+        "int_binary": "binary",
+        "int_char": "binary",
+        "int_geometry": "varbinary",
+        "float_double": "double",
+        "float_timestamp": "varchar",
+        "float_bigint": "float",
+        "float_mediumint": "float",
+        "float_date": "varchar",
+        "float_time": "varchar",
+        "float_datetime": "varchar",
+        "float_year": "float",
+        "float_varchar": "varchar",
+        "float_bit": "double",
+        "float_json": "varbinary",
+        "float_enum": "varchar",
+        "float_set": "varchar",
+        "float_tinyblob": "text",
+        "float_mediumblob": "text",
+        "float_longblob": "longtext",
+        "float_blob": "text",
+        "float_tinytext": "text",
+        "float_mediumtext": "text",
+        "float_longtext": "longtext",
+        "float_text": "text",
+        "float_varbinary": "varbinary",
+        "float_binary": "binary",
+        "float_char": "binary",
+        "float_geometry": "varbinary",
+        "double_timestamp": "varchar",
+        "double_bigint": "double",
+        "double_mediumint": "double",
+        "double_date": "varchar",
+        "double_time": "varchar",
+        "double_datetime": "varchar",
+        "double_year": "double",
+        "double_varchar": "varchar",
+        "double_bit": "double",
+        "double_json": "varbinary",
+        "double_enum": "varchar",
+        "double_set": "varchar",
+        "double_tinyblob": "text",
+        "double_mediumblob": "text",
+        "double_longblob": "longtext",
+        "double_blob": "text",
+        "double_tinytext": "text",
+        "double_mediumtext": "text",
+        "double_longtext": "longtext",
+        "double_text": "text",
+        "double_varbinary": "varbinary",
+        "double_binary": "binary",
+        "double_char": "binary",
+        "double_geometry": "varbinary",
+        "timestamp_bigint": "varchar",
+        "timestamp_mediumint": "varchar",
+        "timestamp_date": "datetime",
+        "timestamp_time": "datetime",
+        "timestamp_datetime": "datetime",
+        "timestamp_year": "varchar",
+        "timestamp_varchar": "varchar",
+        "timestamp_bit": "varbinary",
+        "timestamp_json": "varbinary",
+        "timestamp_enum": "varchar",
+        "timestamp_set": "varchar",
+        "timestamp_tinyblob": "text",
+        "timestamp_mediumblob": "text",
+        "timestamp_longblob": "longtext",
+        "timestamp_blob": "text",
+        "timestamp_tinytext": "text",
+        "timestamp_mediumtext": "text",
+        "timestamp_longtext": "longtext",
+        "timestamp_text": "text",
+        "timestamp_varbinary": "varbinary",
+        "timestamp_binary": "binary",
+        "timestamp_char": "binary",
+        "timestamp_geometry": "varbinary",
+        "bigint_mediumint": "bigint",
+        "bigint_date": "varchar",
+        "bigint_time": "varchar",
+        "bigint_datetime": "varchar",
+        "bigint_year": "bigint",
+        "bigint_varchar": "varchar",
+        "bigint_bit": "decimal",
+        "bigint_json": "varbinary",
+        "bigint_enum": "varchar",
+        "bigint_set": "varchar",
+        "bigint_tinyblob": "text",
+        "bigint_mediumblob": "text",
+        "bigint_longblob": "longtext",
+        "bigint_blob": "text",
+        "bigint_tinytext": "text",
+        "bigint_mediumtext": "text",
+        "bigint_longtext": "longtext",
+        "bigint_text": "text",
+        "bigint_varbinary": "varbinary",
+        "bigint_binary": "binary",
+        "bigint_char": "binary",
+        "bigint_geometry": "varbinary",
+        "mediumint_date": "varchar",
+        "mediumint_time": "varchar",
+        "mediumint_datetime": "varchar",
+        "mediumint_year": "mediumint",
+        "mediumint_varchar": "varchar",
+        "mediumint_bit": "decimal",
+        "mediumint_json": "varbinary",
+        "mediumint_enum": "varchar",
+        "mediumint_set": "varchar",
+        "mediumint_tinyblob": "text",
+        "mediumint_mediumblob": "text",
+        "mediumint_longblob": "longtext",
+        "mediumint_blob": "text",
+        "mediumint_tinytext": "text",
+        "mediumint_mediumtext": "text",
+        "mediumint_longtext": "longtext",
+        "mediumint_text": "text",
+        "mediumint_varbinary": "varbinary",
+        "mediumint_binary": "binary",
+        "mediumint_char": "binary",
+        "mediumint_geometry": "varbinary",
+        "date_time": "datetime",
+        "date_datetime": "datetime",
+        "date_year": "varchar",
+        "date_varchar": "varchar",
+        "date_bit": "varbinary",
+        "date_json": "varbinary",
+        "date_enum": "varchar",
+        "date_set": "varchar",
+        "date_tinyblob": "text",
+        "date_mediumblob": "text",
+        "date_longblob": "longtext",
+        "date_blob": "text",
+        "date_tinytext": "text",
+        "date_mediumtext": "text",
+        "date_longtext": "longtext",
+        "date_text": "text",
+        "date_varbinary": "varbinary",
+        "date_binary": "binary",
+        "date_char": "binary",
+        "date_geometry": "varbinary",
+        "time_datetime": "datetime",
+        "time_year": "varchar",
+        "time_varchar": "varchar",
+        "time_bit": "varbinary",
+        "time_json": "varbinary",
+        "time_enum": "varchar",
+        "time_set": "varchar",
+        "time_tinyblob": "text",
+        "time_mediumblob": "text",
+        "time_longblob": "longtext",
+        "time_blob": "text",
+        "time_tinytext": "text",
+        "time_mediumtext": "text",
+        "time_longtext": "longtext",
+        "time_text": "text",
+        "time_varbinary": "varbinary",
+        "time_binary": "binary",
+        "time_char": "binary",
+        "time_geometry": "varbinary",
+        "datetime_year": "varchar",
+        "datetime_varchar": "varchar",
+        "datetime_bit": "varbinary",
+        "datetime_json": "varbinary",
+        "datetime_enum": "varchar",
+        "datetime_set": "varchar",
+        "datetime_tinyblob": "text",
+        "datetime_mediumblob": "text",
+        "datetime_longblob": "longtext",
+        "datetime_blob": "text",
+        "datetime_tinytext": "text",
+        "datetime_mediumtext": "text",
+        "datetime_longtext": "longtext",
+        "datetime_text": "text",
+        "datetime_varbinary": "varbinary",
+        "datetime_binary": "binary",
+        "datetime_char": "binary",
+        "datetime_geometry": "varbinary",
+        "year_varchar": "varchar",
+        "year_bit": "bigint",
+        "year_json": "varbinary",
+        "year_enum": "varchar",
+        "year_set": "varchar",
+        "year_tinyblob": "text",
+        "year_mediumblob": "text",
+        "year_longblob": "longtext",
+        "year_blob": "text",
+        "year_tinytext": "text",
+        "year_mediumtext": "text",
+        "year_longtext": "longtext",
+        "year_text": "text",
+        "year_varbinary": "varbinary",
+        "year_binary": "binary",
+        "year_char": "binary",
+        "year_geometry": "varbinary",
+        "varchar_bit": "varbinary",
+        "varchar_json": "varbinary",
+        "varchar_enum": "varchar",
+        "varchar_set": "varchar",
+        "varchar_tinyblob": "text",
+        "varchar_mediumblob": "text",
+        "varchar_longblob": "longtext",
+        "varchar_blob": "text",
+        "varchar_tinytext": "text",
+        "varchar_mediumtext": "text",
+        "varchar_longtext": "longtext",
+        "varchar_text": "text",
+        "varchar_varbinary": "varbinary",
+        "varchar_binary": "varbinary",
+        "varchar_char": "varchar",
+        "varchar_geometry": "varbinary",
+        "bit_json": "varbinary",
+        "bit_enum": "varbinary",
+        "bit_set": "varbinary",
+        "bit_tinyblob": "text",
+        "bit_mediumblob": "text",
+        "bit_longblob": "longtext",
+        "bit_blob": "text",
+        "bit_tinytext": "tinytext",
+        "bit_mediumtext": "mediumtext",
+        "bit_longtext": "longtext",
+        "bit_text": "text",
+        "bit_varbinary": "varbinary",
+        "bit_binary": "binary",
+        "bit_char": "binary",
+        "bit_geometry": "varbinary",
+        "json_enum": "varbinary",
+        "json_set": "varbinary",
+        "json_tinyblob": "longtext",
+        "json_mediumblob": "longtext",
+        "json_longblob": "longtext",
+        "json_blob": "longtext",
+        "json_tinytext": "longtext",
+        "json_mediumtext": "longtext",
+        "json_longtext": "longtext",
+        "json_text": "longtext",
+        "json_varbinary": "varbinary",
+        "json_binary": "varbinary",
+        "json_char": "varbinary",
+        "json_geometry": "varbinary",
+        "enum_set": "varchar",
+        "enum_tinyblob": "text",
+        "enum_mediumblob": "text",
+        "enum_longblob": "longtext",
+        "enum_blob": "text",
+        "enum_tinytext": "text",
+        "enum_mediumtext": "text",
+        "enum_longtext": "longtext",
+        "enum_text": "text",
+        "enum_varbinary": "varbinary",
+        "enum_binary": "binary",
+        "enum_char": "binary",
+        "enum_geometry": "varbinary",
+        "set_tinyblob": "text",
+        "set_mediumblob": "text",
+        "set_longblob": "longtext",
+        "set_blob": "text",
+        "set_tinytext": "text",
+        "set_mediumtext": "text",
+        "set_longtext": "longtext",
+        "set_text": "text",
+        "set_varbinary": "varbinary",
+        "set_binary": "binary",
+        "set_char": "binary",
+        "set_geometry": "varbinary",
+        "tinyblob_mediumblob": "text",
+        "tinyblob_longblob": "longtext",
+        "tinyblob_blob": "text",
+        "tinyblob_tinytext": "tinytext",
+        "tinyblob_mediumtext": "mediumtext",
+        "tinyblob_longtext": "longtext",
+        "tinyblob_text": "text",
+        "tinyblob_varbinary": "text",
+        "tinyblob_binary": "text",
+        "tinyblob_char": "text",
+        "tinyblob_geometry": "longtext",
+        "mediumblob_longblob": "longtext",
+        "mediumblob_blob": "text",
+        "mediumblob_tinytext": "text",
+        "mediumblob_mediumtext": "mediumtext",
+        "mediumblob_longtext": "longtext",
+        "mediumblob_text": "text",
+        "mediumblob_varbinary": "text",
+        "mediumblob_binary": "text",
+        "mediumblob_char": "text",
+        "mediumblob_geometry": "longtext",
+        "longblob_blob": "longtext",
+        "longblob_tinytext": "longtext",
+        "longblob_mediumtext": "longtext",
+        "longblob_longtext": "longtext",
+        "longblob_text": "longtext",
+        "longblob_varbinary": "longtext",
+        "longblob_binary": "longtext",
+        "longblob_char": "longtext",
+        "longblob_geometry": "longtext",
+        "blob_tinytext": "text",
+        "blob_mediumtext": "mediumtext",
+        "blob_longtext": "longtext",
+        "blob_text": "text",
+        "blob_varbinary": "text",
+        "blob_binary": "text",
+        "blob_char": "text",
+        "blob_geometry": "longtext",
+        "tinytext_mediumtext": "text",
+        "tinytext_longtext": "longtext",
+        "tinytext_text": "text",
+        "tinytext_varbinary": "tinytext",
+        "tinytext_binary": "tinytext",
+        "tinytext_char": "text",
+        "tinytext_geometry": "longtext",
+        "mediumtext_longtext": "longtext",
+        "mediumtext_text": "text",
+        "mediumtext_varbinary": "mediumtext",
+        "mediumtext_binary": "mediumtext",
+        "mediumtext_char": "text",
+        "mediumtext_geometry": "longtext",
+        "longtext_text": "longtext",
+        "longtext_varbinary": "longtext",
+        "longtext_binary": "longtext",
+        "longtext_char": "longtext",
+        "longtext_geometry": "longtext",
+        "text_varbinary": "text",
+        "text_binary": "text",
+        "text_char": "text",
+        "text_geometry": "longtext",
+        "varbinary_binary": "varbinary",
+        "varbinary_char": "varbinary",
+        "varbinary_geometry": "varbinary",
+        "binary_char": "binary",
+        "binary_geometry": "varbinary",
+        "char_geometry": "varbinary"
+    };
+    if (type1 == type2)
+        return type1;
+    //@ts-ignore
+    //ex. tinyint_smallint or smallint_tinyint
+    return typeMapping[type1 + "_" + type2] || typeMapping[type2 + "_" + type1];
 }
 exports.unionTypeResult = unionTypeResult;
-function analiseQuerySpecification(querySpec, dbSchema, namedParameters, fromColumns) {
+function analiseQuerySpecification(querySpec, dbSchema, withSchema, namedParameters, fromColumns) {
     const context = {
         dbSchema,
+        withSchema,
         parameters: [],
         constraints: [],
         fromColumns: fromColumns
@@ -347,14 +790,16 @@ function walkQuerySpecification(context, querySpec) {
     }
     querySpec.selectItemList().selectItem().forEach(selectItem => {
         const tableWild = selectItem.tableWild(); //ex. t1.*
-        if (tableWild === null || tableWild === void 0 ? void 0 : tableWild.MULT_OPERATOR()) {
+        if (tableWild) {
             tableWild.identifier().forEach(tabWild => {
-                const prefix = tabWild.text;
-                const columns = (0, select_columns_1.selectAllColumns)(prefix, context.fromColumns);
-                columns.forEach(col => {
-                    const colType = freshVar(col.columnName, col.columnType);
-                    listType.push(colType);
-                });
+                if (tableWild.MULT_OPERATOR()) {
+                    const prefix = tabWild.text;
+                    const columns = (0, select_columns_1.selectAllColumns)(prefix, context.fromColumns);
+                    columns.forEach(col => {
+                        const colType = freshVar(col.columnName, col.columnType);
+                        listType.push(colType);
+                    });
+                }
             });
         }
         else {
@@ -1174,11 +1619,11 @@ function walkFunctionParameters(context, simpleExprFunction, params) {
 }
 function walkSubquery(context, queryExpressionParens) {
     const querySpec = (0, parse_1.getQuerySpecificationsFromSelectStatement)(queryExpressionParens);
-    const subqueryColumns = (0, select_columns_1.getColumnsFrom)(querySpec[0], context.dbSchema);
+    const subqueryColumns = (0, select_columns_1.getColumnsFrom)(querySpec[0], context.dbSchema, context.withSchema);
     const newContext = Object.assign(Object.assign({}, context), { fromColumns: context.fromColumns.concat(subqueryColumns) });
     const typeInferResult = walkQuerySpecification(newContext, querySpec[0]);
     for (let queryIndex = 1; queryIndex < querySpec.length; queryIndex++) { //union (if have any)
-        const unionColumns = (0, select_columns_1.getColumnsFrom)(querySpec[queryIndex], context.dbSchema);
+        const unionColumns = (0, select_columns_1.getColumnsFrom)(querySpec[queryIndex], context.dbSchema, context.withSchema);
         const unionNewContext = Object.assign(Object.assign({}, context), { fromColumns: context.fromColumns.concat(unionColumns) });
         const unionResult = walkQuerySpecification(unionNewContext, querySpec[queryIndex]);
         typeInferResult.types.forEach((field, fieldIndex) => {