typesql-cli 0.8.21 → 0.8.23

package/mysql-query-analyzer/traverse.js

@@ -90,16 +90,16 @@ function traverseSelectStatement(selectStatement, traverseContext, namedParamete
         }
         return traverseResult;
     }
-    throw Error('traverseSelectStatement - not supported: ' + selectStatement.text);
+    throw Error('traverseSelectStatement - not supported: ' + selectStatement.getText());
 }
 function traverseInsertStatement(insertStatement, traverseContext) {
     var _a, _b;
     const allParameters = [];
     const paramsNullability = {};
     let exprOrDefaultList = [];
-    const valuesContext = (_a = insertStatement.insertFromConstructor()) === null || _a === void 0 ? void 0 : _a.insertValues().valueList().values();
+    const valuesContext = (_a = insertStatement.insertFromConstructor()) === null || _a === void 0 ? void 0 : _a.insertValues().valueList().values_list();
     if (valuesContext) {
-        exprOrDefaultList = valuesContext.map(valueContext => { var _a; return ((_a = valueContext.children) === null || _a === void 0 ? void 0 : _a.filter(valueContext => valueContext instanceof ts_mysql_parser_1.ExprIsContext || valueContext.text == 'DEFAULT')) || []; });
+        exprOrDefaultList = valuesContext.map(valueContext => { var _a; return ((_a = valueContext.children) === null || _a === void 0 ? void 0 : _a.filter(valueContext => valueContext instanceof ts_mysql_parser_1.ExprIsContext || valueContext.getText() == 'DEFAULT')) || []; });
     }
     const insertIntoTable = (0, collect_constraints_1.getInsertIntoTable)(insertStatement);
     const fromColumns = traverseContext.dbSchema
@@ -127,7 +127,7 @@ function traverseInsertStatement(insertStatement, traverseContext) {
                     paramsNullability[param.type.id] = paramNullabilityExpr.every(n => n) && column.notNull;
                 });
                 traverseContext.constraints.push({
-                    expression: expr.text,
+                    expression: expr.getText(),
                     //TODO - CHANGING ORDER SHOULDN'T AFFECT THE TYPE INFERENCE
                     type1: exprType.kind == 'TypeOperator' ? exprType.types[0] : exprType,
                     type2: (0, collect_constraints_1.freshVar)(column.columnName, column.columnType.type)
@@ -137,9 +137,9 @@ function traverseInsertStatement(insertStatement, traverseContext) {
             }
         });
     });
-    const updateList = ((_b = insertStatement.insertUpdateList()) === null || _b === void 0 ? void 0 : _b.updateList().updateElement()) || [];
+    const updateList = ((_b = insertStatement.insertUpdateList()) === null || _b === void 0 ? void 0 : _b.updateList().updateElement_list()) || [];
     updateList.forEach(updateElement => {
-        const columnName = updateElement.columnRef().text;
+        const columnName = updateElement.columnRef().getText();
         const field = (0, select_columns_1.splitName)(columnName);
         const expr = updateElement.expr();
         if (expr) {
@@ -150,7 +150,7 @@ function traverseInsertStatement(insertStatement, traverseContext) {
                 paramsNullability[param.type.id] = column.notNull;
             });
             traverseContext.constraints.push({
-                expression: expr.text,
+                expression: expr.getText(),
                 type1: exprType,
                 type2: (0, collect_constraints_1.freshVar)(column.columnName, column.columnType.type)
             });
@@ -167,7 +167,7 @@ function traverseInsertStatement(insertStatement, traverseContext) {
                 paramsNullability[type.type.id] = column.notNull;
             }
             traverseContext.constraints.push({
-                expression: insertQueryExpression.text,
+                expression: insertQueryExpression.getText(),
                 type1: type.type,
                 type2: (0, collect_constraints_1.freshVar)(column.columnName, column.columnType.type)
             });
@@ -198,7 +198,7 @@ function traverseInsertStatement(insertStatement, traverseContext) {
 exports.traverseInsertStatement = traverseInsertStatement;
 function traverseUpdateStatement(updateStatement, traverseContext, namedParamters) {
     var _a;
-    const updateElement = updateStatement.updateList().updateElement();
+    const updateElement = updateStatement.updateList().updateElement_list();
     const withClause = updateStatement.withClause();
     const withSchema = [];
     if (withClause) {
@@ -216,11 +216,11 @@ function traverseUpdateStatement(updateStatement, traverseContext, namedParamter
         if (expr) {
             const paramBeforeExpr = traverseContext.parameters.length;
             const result = traverseExpr(expr, traverseContext);
-            const columnName = updateElement.columnRef().text;
+            const columnName = updateElement.columnRef().getText();
             const field = (0, select_columns_1.splitName)(columnName);
             const column = (0, select_columns_1.findColumn)(field, updateColumns);
             traverseContext.constraints.push({
-                expression: updateStatement.text,
+                expression: updateStatement.getText(),
                 type1: result,
                 type2: column.columnType //freshVar(column.columnName, )
             });
@@ -289,7 +289,7 @@ function traverseDeleteStatement(deleteStatement, traverseContext) {
 }
 exports.traverseDeleteStatement = traverseDeleteStatement;
 function getUpdateColumns(updateStatement, traverseContext) {
-    const tableReferences = updateStatement.tableReferenceList().tableReference();
+    const tableReferences = updateStatement.tableReferenceList().tableReference_list();
     const columns = traverseTableReferenceList(tableReferences, traverseContext, null);
     return columns;
 }
@@ -314,15 +314,24 @@ function traverseQueryExpression(queryExpression, traverseContext, cte, recursiv
     if (withClause) {
         traverseWithClause(withClause, traverseContext);
     }
+    let exprResult;
     const queryExpressionBody = queryExpression.queryExpressionBody();
     if (queryExpressionBody) {
-        return traverseQueryExpressionBody(queryExpressionBody, traverseContext, cte, recursiveNames);
+        exprResult = traverseQueryExpressionBody(queryExpressionBody, traverseContext, cte, recursiveNames);
     }
     const queryExpressionParens = queryExpression.queryExpressionParens();
     if (queryExpressionParens) {
-        return traverseQueryExpressionParens(queryExpressionParens, traverseContext, cte, recursiveNames);
+        exprResult = traverseQueryExpressionParens(queryExpressionParens, traverseContext, cte, recursiveNames);
+    }
+    const orderByClause = queryExpression.orderClause();
+    if (orderByClause) {
+        if (orderByClause.getText().toLowerCase() !== 'orderby?') {
+            orderByClause.orderList().orderExpression_list().forEach(orderByExpr => {
+                traverseExpr(orderByExpr.expr(), Object.assign(Object.assign({}, traverseContext), { fromColumns: exprResult.fromColumns || [] }));
+            });
+        }
     }
-    throw Error("walkQueryExpression");
+    return exprResult;
 }
 function traverseQueryExpressionParens(queryExpressionParens, traverseContext, cte, recursiveNames) {
     const queryExpression = queryExpressionParens.queryExpression();
@@ -443,10 +452,10 @@ function traverseQuerySpecification(querySpec, traverseContext) {
 exports.traverseQuerySpecification = traverseQuerySpecification;
 function traverseWithClause(withClause, traverseContext) {
     //result1, result2
-    withClause.commonTableExpression().forEach(commonTableExpression => {
+    withClause.commonTableExpression_list().forEach(commonTableExpression => {
         var _a, _b;
-        const cte = commonTableExpression.identifier().text;
-        const recursiveNames = withClause.RECURSIVE_SYMBOL() ? ((_a = commonTableExpression.columnInternalRefList()) === null || _a === void 0 ? void 0 : _a.columnInternalRef().map(t => t.text)) || [] : undefined;
+        const cte = commonTableExpression.identifier().getText();
+        const recursiveNames = withClause.RECURSIVE_SYMBOL() ? ((_a = commonTableExpression.columnInternalRefList()) === null || _a === void 0 ? void 0 : _a.columnInternalRef_list().map(t => t.getText())) || [] : undefined;
         const subQuery = commonTableExpression.subquery();
         traverseSubquery(subQuery, traverseContext, cte, recursiveNames); //recursive= true??
         (_b = traverseContext.dynamicSqlInfo.with) === null || _b === void 0 ? void 0 : _b.push({
@@ -463,7 +472,7 @@ function traverseWithClause(withClause, traverseContext) {
 exports.traverseWithClause = traverseWithClause;
 function traverseFromClause(fromClause, traverseContext) {
     var _a;
-    const tableReferenceList = (_a = fromClause.tableReferenceList()) === null || _a === void 0 ? void 0 : _a.tableReference();
+    const tableReferenceList = (_a = fromClause.tableReferenceList()) === null || _a === void 0 ? void 0 : _a.tableReference_list();
     const fromColumns = tableReferenceList ? traverseTableReferenceList(tableReferenceList, traverseContext, null) : [];
     return fromColumns;
 }
@@ -488,7 +497,7 @@ function traverseTableReferenceList(tableReferenceList, traverseContext, current
         }
         const allJoinedColumns = [];
         let firstLeftJoinIndex = -1;
-        tab.joinedTable().forEach((joined, index) => {
+        tab.joinedTable_list().forEach((joined, index) => {
             var _a, _b;
             if (((_a = joined.innerJoinType()) === null || _a === void 0 ? void 0 : _a.INNER_SYMBOL()) || ((_b = joined.innerJoinType()) === null || _b === void 0 ? void 0 : _b.JOIN_SYMBOL())) {
                 firstLeftJoinIndex = -1; //dont need to add notNull = false to joins
@@ -540,7 +549,7 @@ function traverseTableReferenceList(tableReferenceList, traverseContext, current
                     traverseExpr(onClause, Object.assign(Object.assign({}, traverseContext), { fromColumns: allJoinedColumns.flatMap(c => c).concat(result) }));
                     const columns = (0, select_columns_1.getExpressions)(onClause, ts_mysql_parser_1.SimpleExprColumnRefContext);
                     columns.forEach(columnRef => {
-                        const fieldName = (0, select_columns_1.splitName)(columnRef.expr.text);
+                        const fieldName = (0, select_columns_1.splitName)(columnRef.expr.getText());
                         if ((innerJoinFragment === null || innerJoinFragment === void 0 ? void 0 : innerJoinFragment.relation) != fieldName.prefix) {
                             innerJoinFragment.parentRelation = fieldName.prefix;
                         }
@@ -573,7 +582,7 @@ function traverseTableFactor(tableFactor, traverseContext, currentFragment) {
     }
     const derivadTable = tableFactor.derivedTable();
     if (derivadTable) {
-        const tableAlias = (_a = derivadTable.tableAlias()) === null || _a === void 0 ? void 0 : _a.identifier().text;
+        const tableAlias = (_a = derivadTable.tableAlias()) === null || _a === void 0 ? void 0 : _a.identifier().getText();
         if (currentFragment) {
             currentFragment.relation = tableAlias;
         }
@@ -605,7 +614,7 @@ function traverseTableFactor(tableFactor, traverseContext, currentFragment) {
 function traverseTableReferenceListParens(ctx, traverseContext) {
     const tableReferenceList = ctx.tableReferenceList();
     if (tableReferenceList) {
-        return traverseTableReferenceList(tableReferenceList.tableReference(), traverseContext, null);
+        return traverseTableReferenceList(tableReferenceList.tableReference_list(), traverseContext, null);
     }
     const tableReferenceListParens = ctx.tableReferenceListParens();
     if (tableReferenceListParens) {
@@ -615,8 +624,8 @@ function traverseTableReferenceListParens(ctx, traverseContext) {
 }
 function traverseSingleTable(singleTable, dbSchema, withSchema, currentFragment, withFragments) {
     var _a;
-    const table = singleTable === null || singleTable === void 0 ? void 0 : singleTable.tableRef().text;
-    const tableAlias = (_a = singleTable === null || singleTable === void 0 ? void 0 : singleTable.tableAlias()) === null || _a === void 0 ? void 0 : _a.identifier().text;
+    const table = singleTable === null || singleTable === void 0 ? void 0 : singleTable.tableRef().getText();
+    const tableAlias = (_a = singleTable === null || singleTable === void 0 ? void 0 : singleTable.tableAlias()) === null || _a === void 0 ? void 0 : _a.identifier().getText();
     const tableName = (0, select_columns_1.splitName)(table);
     if (currentFragment) {
         currentFragment.relation = tableAlias || tableName.name;
@@ -666,12 +675,12 @@ function traverseSelectItemList(selectItemList, traverseContext) {
             }
         });
     }
-    selectItemList.selectItem().forEach(selectItem => {
+    selectItemList.selectItem_list().forEach(selectItem => {
         var _a;
         const tableWild = selectItem.tableWild();
         if (tableWild) {
             if (tableWild.MULT_OPERATOR()) {
-                const itemName = (0, select_columns_1.splitName)(selectItem.text);
+                const itemName = (0, select_columns_1.splitName)(selectItem.getText());
                 const allColumns = selectAllColumns(itemName.prefix, traverseContext.fromColumns);
                 allColumns.forEach(col => {
                     const columnType = (0, collect_constraints_1.createColumnType)(col);
@@ -737,7 +746,7 @@ function traverseExpr(expr, traverseContext) {
             });
             const columnsRef = (0, select_columns_1.getExpressions)(expr, ts_mysql_parser_1.ColumnRefContext);
             columnsRef.forEach(colRef => {
-                const fileName = (0, select_columns_1.splitName)(colRef.expr.text);
+                const fileName = (0, select_columns_1.splitName)(colRef.expr.getText());
                 currentFragment.fields.push({
                     field: fileName.name,
                     name: fileName.name,
@@ -753,7 +762,7 @@ function traverseExpr(expr, traverseContext) {
         if (expr2) {
             return traverseExpr(expr2, traverseContext);
         }
-        return (0, collect_constraints_1.freshVar)(expr.text, 'tinyint');
+        return (0, collect_constraints_1.freshVar)(expr.getText(), 'tinyint');
         ;
     }
     if (expr instanceof ts_mysql_parser_1.ExprAndContext || expr instanceof ts_mysql_parser_1.ExprXorContext || expr instanceof ts_mysql_parser_1.ExprOrContext) {
@@ -778,7 +787,7 @@ function traverseExpr(expr, traverseContext) {
                 });
                 const columnsRef = (0, select_columns_1.getExpressions)(andExpression.expr, ts_mysql_parser_1.ColumnRefContext);
                 columnsRef.forEach(colRef => {
-                    const fileName = (0, select_columns_1.splitName)(colRef.expr.text);
+                    const fileName = (0, select_columns_1.splitName)(colRef.expr.getText());
                     currentFragment.fields.push({
                         field: fileName.name,
                         name: fileName.name,
@@ -788,9 +797,9 @@ function traverseExpr(expr, traverseContext) {
                 traverseContext.dynamicSqlInfo.where.push(currentFragment);
             }
         });
-        return (0, collect_constraints_1.freshVar)(expr.text, 'tinyint');
+        return (0, collect_constraints_1.freshVar)(expr.getText(), 'tinyint');
     }
-    throw Error('traverseExpr - not supported: ' + expr.text);
+    throw Error('traverseExpr - not supported: ' + expr.getText());
 }
 function traverseBoolPri(boolPri, traverseContext) {
     if (boolPri instanceof ts_mysql_parser_1.PrimaryExprPredicateContext) {
@@ -801,7 +810,7 @@ function traverseBoolPri(boolPri, traverseContext) {
     if (boolPri instanceof ts_mysql_parser_1.PrimaryExprIsNullContext) {
         const boolPri2 = boolPri.boolPri();
         traverseBoolPri(boolPri2, traverseContext);
-        return (0, collect_constraints_1.freshVar)(boolPri.text, 'tinyint');
+        return (0, collect_constraints_1.freshVar)(boolPri.getText(), 'tinyint');
     }
     if (boolPri instanceof ts_mysql_parser_1.PrimaryExprCompareContext) {
         const compareLeft = boolPri.boolPri();
@@ -810,11 +819,11 @@ function traverseBoolPri(boolPri, traverseContext) {
         const typeLeft = traverseBoolPri(compareLeft, traverseContext);
         const typeRight = traversePredicate(compareRight, traverseContext);
         traverseContext.constraints.push({
-            expression: boolPri.text,
+            expression: boolPri.getText(),
             type1: typeLeft,
             type2: typeRight
         });
-        return (0, collect_constraints_1.freshVar)(boolPri.text, 'tinyint');
+        return (0, collect_constraints_1.freshVar)(boolPri.getText(), 'tinyint');
     }
     if (boolPri instanceof ts_mysql_parser_1.PrimaryExprAllAnyContext) {
         const compareLeft = boolPri.boolPri();
@@ -822,19 +831,19 @@ function traverseBoolPri(boolPri, traverseContext) {
         const typeLeft = traverseBoolPri(compareLeft, traverseContext);
         const subQueryResult = traverseSubquery(compareRight, traverseContext);
         traverseContext.constraints.push({
-            expression: boolPri.text,
+            expression: boolPri.getText(),
             type1: typeLeft,
             type2: {
                 kind: 'TypeOperator',
                 types: subQueryResult.columns.map(t => t.type)
             }
         });
-        return (0, collect_constraints_1.freshVar)(boolPri.text, 'tinyint');
+        return (0, collect_constraints_1.freshVar)(boolPri.getText(), 'tinyint');
     }
     throw Error('traverseExpr - not supported: ' + boolPri.constructor.name);
 }
 function traversePredicate(predicate, traverseContext) {
-    const bitExpr = predicate.bitExpr()[0]; //TODO - predicate length = 2? [1] == predicateOperations
+    const bitExpr = predicate.bitExpr(0); //TODO - predicate length = 2? [1] == predicateOperations
     const bitExprType = traverseBitExpr(bitExpr, traverseContext);
     const predicateOperations = predicate.predicateOperations();
     if (predicateOperations) {
@@ -842,7 +851,7 @@ function traversePredicate(predicate, traverseContext) {
         if (bitExprType.kind == 'TypeOperator' && rightType.kind == 'TypeOperator') {
             rightType.types.forEach((t, i) => {
                 traverseContext.constraints.push({
-                    expression: predicateOperations.text,
+                    expression: predicateOperations.getText(),
                     type1: t, // ? array of id+id
                     type2: bitExprType.types[i],
                     mostGeneralType: true
@@ -852,7 +861,7 @@ function traversePredicate(predicate, traverseContext) {
         if (bitExprType.kind == 'TypeVar' && rightType.kind == 'TypeOperator') {
             rightType.types.forEach((t, i) => {
                 traverseContext.constraints.push({
-                    expression: predicateOperations.text,
+                    expression: predicateOperations.getText(),
                     type1: bitExprType, // ? array of id+id
                     type2: Object.assign(Object.assign({}, t), { list: true }),
                     mostGeneralType: true
@@ -865,7 +874,7 @@ function traversePredicate(predicate, traverseContext) {
     return bitExprType;
 }
 function traverseExprList(exprList, traverseContext) {
-    const listType = exprList.expr().map(item => {
+    const listType = exprList.expr_list().map(item => {
         const exprType = traverseExpr(item, traverseContext);
         return exprType;
     });
@@ -880,17 +889,17 @@ function traverseBitExpr(bitExpr, traverseContext) {
     if (simpleExpr) {
         return traverseSimpleExpr(simpleExpr, Object.assign(Object.assign({}, traverseContext), { where: false }));
     }
-    if (bitExpr.bitExpr().length == 2) {
-        const bitExprLeft = bitExpr.bitExpr()[0];
+    if (bitExpr.bitExpr_list().length == 2) {
+        const bitExprLeft = bitExpr.bitExpr(0);
         const typeLeftTemp = traverseBitExpr(bitExprLeft, traverseContext);
         const typeLeft = typeLeftTemp.kind == 'TypeOperator' ? typeLeftTemp.types[0] : typeLeftTemp;
         //const newTypeLeft = typeLeft.name == '?'? freshVar('?', 'bigint') : typeLeft;
-        const bitExprRight = bitExpr.bitExpr()[1];
+        const bitExprRight = bitExpr.bitExpr(1);
         const typeRightTemp = traverseBitExpr(bitExprRight, traverseContext);
         //In the expression 'id + (value + 2) + ?' the '(value+2)' is treated as a SimpleExprListContext and return a TypeOperator
         const typeRight = typeRightTemp.kind == 'TypeOperator' ? typeRightTemp.types[0] : typeRightTemp;
         //const newTypeRight = typeRight.name == '?'? freshVar('?', 'bigint') : typeRight;
-        const bitExprType = (0, collect_constraints_1.freshVar)(bitExpr.text, '?');
+        const bitExprType = (0, collect_constraints_1.freshVar)(bitExpr.getText(), '?');
         if (typeLeftTemp.kind == 'TypeVar' && typeRightTemp.kind == 'TypeVar' && typeLeftTemp.table == typeRightTemp.table) {
             bitExprType.table = typeLeftTemp.table;
         }
@@ -917,14 +926,14 @@ function traverseBitExpr(bitExpr, traverseContext) {
         //     coercionType: 'Sum'
         // })
         traverseContext.constraints.push({
-            expression: bitExprLeft.text,
+            expression: bitExprLeft.getText(),
             type1: bitExprType,
             type2: typeLeft,
             mostGeneralType: true,
             coercionType: 'Sum'
         });
         traverseContext.constraints.push({
-            expression: bitExprRight.text,
+            expression: bitExprRight.getText(),
             type1: bitExprType,
             type2: typeRight,
             mostGeneralType: true,
@@ -941,12 +950,12 @@ function traverseBitExpr(bitExpr, traverseContext) {
         return bitExprType;
     }
     if (bitExpr.INTERVAL_SYMBOL()) {
-        const bitExpr2 = bitExpr.bitExpr()[0];
+        const bitExpr2 = bitExpr.bitExpr(0);
         const leftType = traverseBitExpr(bitExpr2, traverseContext);
         const expr = bitExpr.expr(); //expr interval
         traverseExpr(expr, traverseContext);
         traverseContext.constraints.push({
-            expression: bitExpr.text,
+            expression: bitExpr.getText(),
             type1: leftType,
             type2: (0, collect_constraints_1.freshVar)('datetime', 'datetime')
         });
@@ -968,10 +977,10 @@ function traversePredicateOperations(predicateOperations, parentType, traverseCo
         }
     }
     if (predicateOperations instanceof ts_mysql_parser_1.PredicateExprLikeContext) {
-        const simpleExpr = predicateOperations.simpleExpr()[0];
+        const simpleExpr = predicateOperations.simpleExpr(0);
         const rightType = traverseSimpleExpr(simpleExpr, Object.assign(Object.assign({}, traverseContext), { where: false }));
         traverseContext.constraints.push({
-            expression: simpleExpr.text,
+            expression: simpleExpr.getText(),
             type1: parentType,
             type2: rightType
         });
@@ -983,17 +992,17 @@ function traversePredicateOperations(predicateOperations, parentType, traverseCo
         const bitExprType = traverseBitExpr(bitExpr, traverseContext);
         const predicateType = traversePredicate(predicate, traverseContext);
         traverseContext.constraints.push({
-            expression: predicateOperations.text,
+            expression: predicateOperations.getText(),
             type1: parentType,
             type2: bitExprType
         });
         traverseContext.constraints.push({
-            expression: predicateOperations.text,
+            expression: predicateOperations.getText(),
             type1: parentType,
             type2: predicateType
         });
         traverseContext.constraints.push({
-            expression: predicateOperations.text,
+            expression: predicateOperations.getText(),
             type1: bitExprType,
             type2: predicateType
         });
@@ -1004,11 +1013,11 @@ function traversePredicateOperations(predicateOperations, parentType, traverseCo
 function traverseSimpleExpr(simpleExpr, traverseContext) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprColumnRefContext) {
-        const fieldName = (0, select_columns_1.splitName)(simpleExpr.text);
+        const fieldName = (0, select_columns_1.splitName)(simpleExpr.getText());
         const column = (0, select_columns_1.findColumn)(fieldName, traverseContext.fromColumns);
         const typeVar = (0, collect_constraints_1.freshVar)(column.columnName, column.columnType.type, column.tableAlias || column.table);
         traverseContext.constraints.push({
-            expression: simpleExpr.text,
+            expression: simpleExpr.getText(),
             type1: typeVar,
             type2: column.columnType,
             mostGeneralType: true
@@ -1033,19 +1042,19 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             type: param,
             notNull: false,
             table: param.table || '',
-            paramIndex: simpleExpr.start.startIndex
+            paramIndex: simpleExpr.start.start
         });
         return param;
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprLiteralContext) {
         const literal = simpleExpr.literal();
         if (literal.textLiteral()) {
-            const text = ((_a = literal.textLiteral()) === null || _a === void 0 ? void 0 : _a.text.slice(1, -1)) || ''; //remove quotes
+            const text = ((_a = literal.textLiteral()) === null || _a === void 0 ? void 0 : _a.getText().slice(1, -1)) || ''; //remove quotes
             return (0, collect_constraints_1.freshVar)(text, 'varchar');
         }
         const numLiteral = literal.numLiteral();
         if (numLiteral) {
-            return (0, collect_constraints_1.freshVar)(numLiteral.text, 'int');
+            return (0, collect_constraints_1.freshVar)(numLiteral.getText(), 'int');
             // addNamedNode(simpleExpr, freshVar('bigint', 'bigint'), namedNodes)
             // if(numLiteral.INT_NUMBER()) {
             //     const typeInt = freshVar('int', 'int');
@@ -1063,18 +1072,18 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         }
         const boolLiteral = literal.boolLiteral();
         if (boolLiteral) {
-            return (0, collect_constraints_1.freshVar)(boolLiteral.text, 'bit');
+            return (0, collect_constraints_1.freshVar)(boolLiteral.getText(), 'bit');
         }
         const nullLiteral = literal.nullLiteral();
         if (nullLiteral) {
-            return (0, collect_constraints_1.freshVar)(nullLiteral.text, '?');
+            return (0, collect_constraints_1.freshVar)(nullLiteral.getText(), '?');
         }
-        throw Error('literal not supported:' + literal.text);
+        throw Error('literal not supported:' + literal.getText());
         //...
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprListContext) {
         const exprList = simpleExpr.exprList();
-        const listType = exprList.expr().map(item => {
+        const listType = exprList.expr_list().map(item => {
             const exprType = traverseExpr(item, Object.assign(Object.assign({}, traverseContext), { where: false }));
             return exprType;
         });
@@ -1094,21 +1103,21 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprCaseContext) {
         //case when expr then expr else expr
-        const caseType = (0, collect_constraints_1.freshVar)(simpleExpr.text, '?');
-        simpleExpr.whenExpression().forEach(whenExprCont => {
+        const caseType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), '?');
+        simpleExpr.whenExpression_list().forEach(whenExprCont => {
             const whenExpr = whenExprCont.expr();
             const whenType = traverseExpr(whenExpr, traverseContext);
             traverseContext.constraints.push({
-                expression: whenExpr.text,
+                expression: whenExpr.getText(),
                 type1: whenType.kind == 'TypeOperator' ? whenType.types[0] : whenType,
                 type2: (0, collect_constraints_1.freshVar)('tinyint', 'tinyint') //bool
             });
         });
-        const thenTypes = simpleExpr.thenExpression().map(thenExprCtx => {
+        const thenTypes = simpleExpr.thenExpression_list().map(thenExprCtx => {
             const thenExpr = thenExprCtx.expr();
             const thenType = traverseExpr(thenExpr, traverseContext);
             traverseContext.constraints.push({
-                expression: thenExprCtx.text,
+                expression: thenExprCtx.getText(),
                 type1: caseType,
                 type2: thenType.kind == 'TypeOperator' ? thenType.types[0] : thenType,
                 mostGeneralType: true,
@@ -1119,7 +1128,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         if (elseExpr) {
             const elseType = traverseExpr(elseExpr, traverseContext);
             traverseContext.constraints.push({
-                expression: (_c = simpleExpr.elseExpression()) === null || _c === void 0 ? void 0 : _c.text,
+                expression: (_c = simpleExpr.elseExpression()) === null || _c === void 0 ? void 0 : _c.getText(),
                 type1: caseType,
                 type2: elseType.kind == 'TypeOperator' ? elseType.types[0] : elseType,
                 mostGeneralType: true
@@ -1127,7 +1136,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             thenTypes.forEach(thenType => {
                 var _a;
                 traverseContext.constraints.push({
-                    expression: (_a = simpleExpr.elseExpression()) === null || _a === void 0 ? void 0 : _a.text,
+                    expression: (_a = simpleExpr.elseExpression()) === null || _a === void 0 ? void 0 : _a.getText(),
                     type1: thenType,
                     type2: elseType.kind == 'TypeOperator' ? elseType.types[0] : elseType,
                     mostGeneralType: true
@@ -1137,13 +1146,13 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         return caseType;
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprIntervalContext) {
-        const exprList = simpleExpr.expr();
+        const exprList = simpleExpr.expr_list();
         const exprLeft = exprList[0];
         const exprRight = exprList[1];
         const typeLeft = traverseExpr(exprLeft, traverseContext);
         const typeRight = traverseExpr(exprRight, traverseContext);
         traverseContext.constraints.push({
-            expression: exprLeft.text,
+            expression: exprLeft.getText(),
             type1: typeLeft,
             type2: (0, collect_constraints_1.freshVar)('bigint', 'bigint')
         });
@@ -1151,7 +1160,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             typeRight.type = 'datetime';
         }
         traverseContext.constraints.push({
-            expression: exprRight.text,
+            expression: exprRight.getText(),
             type1: typeRight,
             type2: (0, collect_constraints_1.freshVar)('datetime', 'datetime')
         });
@@ -1160,12 +1169,12 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprSumContext) {
         const sumExpr = simpleExpr.sumExpr();
         if (sumExpr.MAX_SYMBOL() || sumExpr.MIN_SYMBOL()) {
-            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.text, '?');
+            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), '?');
             const inSumExpr = (_d = sumExpr.inSumExpr()) === null || _d === void 0 ? void 0 : _d.expr();
             if (inSumExpr) {
                 const inSumExprType = traverseExpr(inSumExpr, traverseContext);
                 traverseContext.constraints.push({
-                    expression: simpleExpr.text,
+                    expression: simpleExpr.getText(),
                     type1: functionType,
                     type2: inSumExprType,
                     mostGeneralType: true
@@ -1174,7 +1183,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             return functionType;
         }
         if (sumExpr.COUNT_SYMBOL()) {
-            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.text, 'bigint');
+            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'bigint');
             const inSumExpr = (_e = sumExpr.inSumExpr()) === null || _e === void 0 ? void 0 : _e.expr();
             if (inSumExpr) {
                 traverseExpr(inSumExpr, traverseContext);
@@ -1182,12 +1191,12 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             return functionType;
         }
         if (sumExpr.SUM_SYMBOL() || sumExpr.AVG_SYMBOL()) {
-            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.text, '?');
+            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), '?');
             const inSumExpr = (_f = sumExpr.inSumExpr()) === null || _f === void 0 ? void 0 : _f.expr();
             if (inSumExpr) {
                 const inSumExprType = traverseExpr(inSumExpr, traverseContext);
                 traverseContext.constraints.push({
-                    expression: simpleExpr.text,
+                    expression: simpleExpr.getText(),
                     type1: functionType,
                     type2: inSumExprType,
                     mostGeneralType: true,
@@ -1202,7 +1211,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         if (sumExpr.GROUP_CONCAT_SYMBOL()) {
             const exprList = sumExpr.exprList();
             if (exprList) {
-                exprList.expr().map(item => {
+                exprList.expr_list().map(item => {
                     const exprType = traverseExpr(item, traverseContext);
                     return exprType;
                 });
@@ -1211,7 +1220,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                 in which case the result type is VARCHAR or VARBINARY.
                 */
                 //TODO - Infer TEXT/BLOB or VARCHAR/VARBINARY
-                return (0, collect_constraints_1.freshVar)(sumExpr.text, 'varchar');
+                return (0, collect_constraints_1.freshVar)(sumExpr.getText(), 'varchar');
                 ;
             }
         }
@@ -1220,20 +1229,20 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprRuntimeFunctionContext) {
         const runtimeFunctionCall = simpleExpr.runtimeFunctionCall();
         if (runtimeFunctionCall.NOW_SYMBOL()) {
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, 'datetime');
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'datetime');
         }
         if (runtimeFunctionCall.CURDATE_SYMBOL()) {
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, 'date');
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'date');
         }
         if (runtimeFunctionCall.CURTIME_SYMBOL()) {
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, 'time');
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'time');
         }
         if (runtimeFunctionCall.REPLACE_SYMBOL()) {
-            const exprList = runtimeFunctionCall.expr();
+            const exprList = runtimeFunctionCall.expr_list();
             exprList.forEach(expr => {
                 const exprType = traverseExpr(expr, traverseContext);
                 traverseContext.constraints.push({
-                    expression: expr.text,
+                    expression: expr.getText(),
                     type1: exprType,
                     type2: (0, collect_constraints_1.freshVar)('varchar', 'varchar')
                 });
@@ -1251,13 +1260,13 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                     paramType.type = 'date';
                 }
                 traverseContext.constraints.push({
-                    expression: expr.text,
+                    expression: expr.getText(),
                     type1: paramType,
-                    type2: (0, collect_constraints_1.freshVar)(simpleExpr.text, 'date')
+                    type2: (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'date')
                 });
             }
             const returnType = runtimeFunctionCall.YEAR_SYMBOL() ? 'year' : 'tinyint';
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, returnType);
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), returnType);
         }
         if (runtimeFunctionCall.DATE_SYMBOL()) {
             const expr = (_h = runtimeFunctionCall.exprWithParentheses()) === null || _h === void 0 ? void 0 : _h.expr();
@@ -1270,12 +1279,12 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                     paramType.type = 'date';
                 }
                 traverseContext.constraints.push({
-                    expression: expr.text,
+                    expression: expr.getText(),
                     type1: paramType,
-                    type2: (0, collect_constraints_1.freshVar)(simpleExpr.text, 'date')
+                    type2: (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'date')
                 });
             }
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, 'date');
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'date');
         }
         if (runtimeFunctionCall.HOUR_SYMBOL() || runtimeFunctionCall.MINUTE_SYMBOL() || runtimeFunctionCall.SECOND_SYMBOL()) {
             const expr = (_j = runtimeFunctionCall.exprWithParentheses()) === null || _j === void 0 ? void 0 : _j.expr();
@@ -1291,23 +1300,23 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                     paramType.type = 'datetime';
                 }
                 traverseContext.constraints.push({
-                    expression: expr.text,
+                    expression: expr.getText(),
                     type1: paramType,
-                    type2: (0, collect_constraints_1.freshVar)(simpleExpr.text, 'time')
+                    type2: (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'time')
                 });
             }
             //HOUR can return values greater than 23. Ex.: SELECT HOUR('272:59:59');
             //https://dev.mysql.com/doc/refman/8.0/en/date-and-time-functions.html#function_hour
             const returnType = runtimeFunctionCall.HOUR_SYMBOL() ? 'int' : 'tinyint';
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, returnType);
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), returnType);
         }
         const trimFunction = runtimeFunctionCall.trimFunction();
         if (trimFunction) {
-            const exprList = trimFunction.expr();
+            const exprList = trimFunction.expr_list();
             if (exprList.length == 1) {
                 const exprType = traverseExpr(exprList[0], traverseContext);
                 traverseContext.constraints.push({
-                    expression: exprList[0].text,
+                    expression: exprList[0].getText(),
                     type1: exprType,
                     type2: (0, collect_constraints_1.freshVar)('varchar', 'varchar')
                 });
@@ -1316,12 +1325,12 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                 const exprType = traverseExpr(exprList[0], traverseContext);
                 const expr2Type = traverseExpr(exprList[1], traverseContext);
                 traverseContext.constraints.push({
-                    expression: exprList[0].text,
+                    expression: exprList[0].getText(),
                     type1: exprType,
                     type2: (0, collect_constraints_1.freshVar)('varchar', 'varchar')
                 });
                 traverseContext.constraints.push({
-                    expression: exprList[1].text,
+                    expression: exprList[1].getText(),
                     type1: expr2Type,
                     type2: (0, collect_constraints_1.freshVar)('varchar', 'varchar')
                 });
@@ -1330,7 +1339,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         }
         const substringFunction = runtimeFunctionCall.substringFunction();
         if (substringFunction) {
-            const exprList = substringFunction.expr();
+            const exprList = substringFunction.expr_list();
             const varcharParam = (0, collect_constraints_1.freshVar)('varchar', 'varchar');
             const intParam = (0, collect_constraints_1.freshVar)('int', 'int');
             const params = {
@@ -1346,27 +1355,27 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             || runtimeFunctionCall.DATE_SUB_SYMBOL()) {
             //SELECT ADDDATE('2008-01-02', INTERVAL 31 DAY)
             //SELECT ADDDATE('2008-01-02', 31)
-            const expr1 = runtimeFunctionCall.expr()[0];
-            const expr2 = runtimeFunctionCall.expr()[1];
+            const expr1 = runtimeFunctionCall.expr(0);
+            const expr2 = runtimeFunctionCall.expr(1);
             const typeExpr1 = traverseExpr(expr1, traverseContext);
             const typeExpr2 = traverseExpr(expr2, traverseContext);
             if (typeExpr1.kind == 'TypeVar' && ((0, collect_constraints_1.isDateLiteral)(typeExpr1.name) || (0, collect_constraints_1.isDateTimeLiteral)(typeExpr1.name))) {
                 typeExpr1.type = 'datetime';
             }
             traverseContext.constraints.push({
-                expression: expr1.text,
+                expression: expr1.getText(),
                 type1: typeExpr1,
                 type2: (0, collect_constraints_1.freshVar)('datetime', 'datetime')
             });
             traverseContext.constraints.push({
-                expression: expr2.text,
+                expression: expr2.getText(),
                 type1: typeExpr2,
                 type2: (0, collect_constraints_1.freshVar)('bigint', 'bigint')
             });
             return (0, collect_constraints_1.freshVar)('datetime', 'datetime');
         }
         if (runtimeFunctionCall.COALESCE_SYMBOL()) {
-            const exprList = (_k = runtimeFunctionCall.exprListWithParentheses()) === null || _k === void 0 ? void 0 : _k.exprList().expr();
+            const exprList = (_k = runtimeFunctionCall.exprListWithParentheses()) === null || _k === void 0 ? void 0 : _k.exprList().expr_list();
             if (exprList) {
                 const paramType = (0, collect_constraints_1.freshVar)('COALESCE', 'any');
                 const params = {
@@ -1376,7 +1385,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                 const paramsTypeList = traverseExprListParameters(exprList, params, traverseContext);
                 paramsTypeList.forEach((typeVar, paramIndex) => {
                     traverseContext.constraints.push({
-                        expression: runtimeFunctionCall.text + '_param' + (paramIndex + 1),
+                        expression: runtimeFunctionCall.getText() + '_param' + (paramIndex + 1),
                         type1: paramType,
                         type2: typeVar,
                         mostGeneralType: true,
@@ -1389,31 +1398,31 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         //MOD (number, number): number
         if (runtimeFunctionCall.MOD_SYMBOL()) {
             const functionType = (0, collect_constraints_1.freshVar)('number', 'number');
-            const exprList = runtimeFunctionCall.expr();
+            const exprList = runtimeFunctionCall.expr_list();
             const param1 = traverseExpr(exprList[0], traverseContext);
             const param2 = traverseExpr(exprList[1], traverseContext);
             traverseContext.constraints.push({
-                expression: simpleExpr.text,
+                expression: simpleExpr.getText(),
                 type1: (0, collect_constraints_1.freshVar)('number', 'number'),
                 type2: param1,
                 mostGeneralType: true,
                 coercionType: 'Numeric'
             });
             traverseContext.constraints.push({
-                expression: simpleExpr.text,
+                expression: simpleExpr.getText(),
                 type1: (0, collect_constraints_1.freshVar)('number', 'number'),
                 type2: param2,
                 mostGeneralType: true,
                 coercionType: 'Numeric'
             });
             traverseContext.constraints.push({
-                expression: simpleExpr.text,
+                expression: simpleExpr.getText(),
                 type1: functionType,
                 type2: param1,
                 mostGeneralType: true
             });
             traverseContext.constraints.push({
-                expression: simpleExpr.text,
+                expression: simpleExpr.getText(),
                 type1: functionType,
                 type2: param2,
                 mostGeneralType: true
@@ -1421,7 +1430,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             return functionType;
         }
         if (runtimeFunctionCall.IF_SYMBOL()) {
-            const exprList = runtimeFunctionCall.expr();
+            const exprList = runtimeFunctionCall.expr_list();
             const expr1 = exprList[0];
             const expr2 = exprList[1];
             const expr3 = exprList[2];
@@ -1429,19 +1438,19 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             const expr2Type = traverseExpr(expr2, traverseContext);
             const expr3Type = traverseExpr(expr3, traverseContext);
             traverseContext.constraints.push({
-                expression: runtimeFunctionCall.text,
+                expression: runtimeFunctionCall.getText(),
                 type1: expr2Type,
                 type2: expr3Type,
                 mostGeneralType: true
             });
             return expr2Type;
         }
-        throw Error('Function not supported: ' + runtimeFunctionCall.text);
+        throw Error('Function not supported: ' + runtimeFunctionCall.getText());
     }
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprFunctionContext) {
         const functionIdentifier = (0, collect_constraints_1.getFunctionName)(simpleExpr);
         if (functionIdentifier === 'concat_ws' || (functionIdentifier === null || functionIdentifier === void 0 ? void 0 : functionIdentifier.toLowerCase()) === 'concat') {
-            const varcharType = (0, collect_constraints_1.freshVar)(simpleExpr.text, 'varchar');
+            const varcharType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'varchar');
             const params = {
                 kind: 'VariableLengthParams',
                 paramType: 'varchar'
@@ -1450,9 +1459,9 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             return varcharType;
         }
         if (functionIdentifier === 'avg') {
-            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.text, '?');
+            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), '?');
             traverseContext.constraints.push({
-                expression: simpleExpr.text,
+                expression: simpleExpr.getText(),
                 type1: functionType,
                 type2: (0, collect_constraints_1.freshVar)('decimal', 'decimal'),
                 mostGeneralType: true
@@ -1465,7 +1474,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             return functionType;
         }
         if (functionIdentifier === 'round') {
-            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.text, '?');
+            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), '?');
             const params = {
                 kind: 'FixedLengthParams',
                 paramsType: [functionType]
@@ -1473,7 +1482,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             const paramsType = walkFunctionParameters(simpleExpr, params, traverseContext);
             //The return value has the same type as the first argument
             traverseContext.constraints.push({
-                expression: simpleExpr.text,
+                expression: simpleExpr.getText(),
                 type1: functionType,
                 type2: paramsType[0], //type of the first parameter
                 mostGeneralType: true
@@ -1487,7 +1496,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                 paramsType: [doubleParam, doubleParam]
             };
             walkFunctionParameters(simpleExpr, params, traverseContext);
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, 'bigint');
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'bigint');
         }
         if (functionIdentifier === 'str_to_date') {
             const varcharParam = (0, collect_constraints_1.freshVar)('varchar', 'varchar');
@@ -1496,40 +1505,40 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
                 paramsType: [varcharParam, varcharParam]
             };
             walkFunctionParameters(simpleExpr, params, traverseContext);
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, 'date');
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'date');
         }
         if (functionIdentifier === 'datediff') {
-            const udfExprList = (_l = simpleExpr.functionCall().udfExprList()) === null || _l === void 0 ? void 0 : _l.udfExpr();
+            const udfExprList = (_l = simpleExpr.functionCall().udfExprList()) === null || _l === void 0 ? void 0 : _l.udfExpr_list();
             if (udfExprList) {
                 udfExprList.forEach((inExpr) => {
                     const expr = inExpr.expr();
                     const exprType = traverseExpr(expr, traverseContext);
                     const newType = (0, collect_constraints_1.verifyDateTypesCoercion)(exprType);
                     traverseContext.constraints.push({
-                        expression: expr.text,
+                        expression: expr.getText(),
                         type1: newType,
                         type2: (0, collect_constraints_1.freshVar)('date', 'date'),
                         mostGeneralType: true
                     });
                 });
             }
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, 'bigint');
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'bigint');
         }
         if (functionIdentifier === 'period_add' || functionIdentifier == 'period_diff') {
-            const udfExprList = (_m = simpleExpr.functionCall().udfExprList()) === null || _m === void 0 ? void 0 : _m.udfExpr();
+            const udfExprList = (_m = simpleExpr.functionCall().udfExprList()) === null || _m === void 0 ? void 0 : _m.udfExpr_list();
             if (udfExprList) {
                 udfExprList.forEach((inExpr) => {
                     const expr = inExpr.expr();
                     const exprType = traverseExpr(expr, traverseContext);
                     traverseContext.constraints.push({
-                        expression: expr.text,
+                        expression: expr.getText(),
                         type1: exprType,
                         type2: (0, collect_constraints_1.freshVar)('bigint', 'bigint'),
                         mostGeneralType: true
                     });
                 });
             }
-            return (0, collect_constraints_1.freshVar)(simpleExpr.text, 'bigint');
+            return (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'bigint');
         }
         if (functionIdentifier === 'lpad' || functionIdentifier == 'rpad') {
             const varcharParam = (0, collect_constraints_1.freshVar)('varchar', 'varchar');
@@ -1567,11 +1576,11 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         }
         if (functionIdentifier === 'abs') {
             const functionType = (0, collect_constraints_1.freshVar)('number', 'number');
-            const udfExprList = (_o = simpleExpr.functionCall().udfExprList()) === null || _o === void 0 ? void 0 : _o.udfExpr();
+            const udfExprList = (_o = simpleExpr.functionCall().udfExprList()) === null || _o === void 0 ? void 0 : _o.udfExpr_list();
             udfExprList === null || udfExprList === void 0 ? void 0 : udfExprList.forEach(expr => {
                 const param1 = traverseExpr(expr.expr(), traverseContext);
                 traverseContext.constraints.push({
-                    expression: simpleExpr.text,
+                    expression: simpleExpr.getText(),
                     type1: functionType,
                     type2: param1,
                     mostGeneralType: true,
@@ -1582,11 +1591,11 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         }
         if (functionIdentifier == 'ceiling' || functionIdentifier == 'ceil') {
             const functionType = (0, collect_constraints_1.freshVar)('number', 'number');
-            const udfExprList = (_p = simpleExpr.functionCall().udfExprList()) === null || _p === void 0 ? void 0 : _p.udfExpr();
+            const udfExprList = (_p = simpleExpr.functionCall().udfExprList()) === null || _p === void 0 ? void 0 : _p.udfExpr_list();
             udfExprList === null || udfExprList === void 0 ? void 0 : udfExprList.forEach(expr => {
                 const param1 = traverseExpr(expr.expr(), traverseContext);
                 traverseContext.constraints.push({
-                    expression: simpleExpr.text,
+                    expression: simpleExpr.getText(),
                     type1: functionType,
                     type2: param1,
                     mostGeneralType: true,
@@ -1596,17 +1605,17 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             return functionType;
         }
         if (functionIdentifier == 'timestampdiff') {
-            const udfExprList = (_q = simpleExpr.functionCall().udfExprList()) === null || _q === void 0 ? void 0 : _q.udfExpr();
+            const udfExprList = (_q = simpleExpr.functionCall().udfExprList()) === null || _q === void 0 ? void 0 : _q.udfExpr_list();
             if (udfExprList) {
                 const [first, ...rest] = udfExprList;
-                const unit = first.text.trim().toLowerCase();
+                const unit = first.getText().trim().toLowerCase();
                 rest.forEach((inExpr, paramIndex) => {
                     const expr = inExpr.expr();
                     const exprType = traverseExpr(expr, traverseContext);
                     const newType = (0, collect_constraints_1.verifyDateTypesCoercion)(exprType);
                     //const expectedType = ['hour', 'minute', 'second'].includes(unit)? 'time' : 'datetime'
                     traverseContext.constraints.push({
-                        expression: expr.text,
+                        expression: expr.getText(),
                         type1: newType,
                         type2: (0, collect_constraints_1.freshVar)('datetime', 'datetime'),
                         mostGeneralType: true
@@ -1616,19 +1625,19 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
             return (0, collect_constraints_1.freshVar)('int', 'int');
         }
         if (functionIdentifier == 'ifnull' || functionIdentifier == 'nullif') {
-            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.text, '?');
-            const udfExprList = (_r = simpleExpr.functionCall().udfExprList()) === null || _r === void 0 ? void 0 : _r.udfExpr();
+            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), '?');
+            const udfExprList = (_r = simpleExpr.functionCall().udfExprList()) === null || _r === void 0 ? void 0 : _r.udfExpr_list();
             if (udfExprList) {
                 const [expr1, expr2] = udfExprList;
                 const expr1Type = traverseExpr(expr1.expr(), traverseContext);
                 traverseContext.constraints.push({
-                    expression: expr1.text,
+                    expression: expr1.getText(),
                     type1: functionType,
                     type2: expr1Type
                 });
                 const expr2Type = traverseExpr(expr2.expr(), traverseContext);
                 traverseContext.constraints.push({
-                    expression: expr2.text,
+                    expression: expr2.getText(),
                     type1: functionType,
                     type2: expr2Type
                 });
@@ -1638,15 +1647,15 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
         if (functionIdentifier == 'md5' //md5(str) - TODO - have input constraint = string
             || functionIdentifier == 'hex' //md5(n or str)
             || functionIdentifier == 'unhex') { //unhex (str) - TODO - have input constraint = string
-            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.text, 'char');
-            const udfExprList = (_s = simpleExpr.functionCall().udfExprList()) === null || _s === void 0 ? void 0 : _s.udfExpr();
+            const functionType = (0, collect_constraints_1.freshVar)(simpleExpr.getText(), 'char');
+            const udfExprList = (_s = simpleExpr.functionCall().udfExprList()) === null || _s === void 0 ? void 0 : _s.udfExpr_list();
             if (udfExprList) {
                 const [expr1] = udfExprList;
                 const paramType = traverseExpr(expr1.expr(), traverseContext);
                 traverseContext.constraints.push({
-                    expression: expr1.text,
+                    expression: expr1.getText(),
                     type1: paramType,
-                    type2: (0, collect_constraints_1.freshVar)(expr1.text, 'varchar')
+                    type2: (0, collect_constraints_1.freshVar)(expr1.getText(), 'varchar')
                 });
             }
             return functionType;
@@ -1660,7 +1669,7 @@ function traverseSimpleExpr(simpleExpr, traverseContext) {
     if (simpleExpr instanceof ts_mysql_parser_1.SimpleExprCastContext) {
         const castType = simpleExpr.castType();
         if (castType.CHAR_SYMBOL()) {
-            return (0, collect_constraints_1.freshVar)(castType.text, 'char');
+            return (0, collect_constraints_1.freshVar)(castType.getText(), 'char');
         }
     }
     throw Error('traverseSimpleExpr - not supported: ' + simpleExpr.constructor.name);
@@ -1671,7 +1680,7 @@ function traverseWindowFunctionCall(windowFunctionCall, traverseContext) {
         || windowFunctionCall.DENSE_RANK_SYMBOL()
         || windowFunctionCall.CUME_DIST_SYMBOL()
         || windowFunctionCall.PERCENT_RANK_SYMBOL()) {
-        return (0, collect_constraints_1.freshVar)(windowFunctionCall.text, 'bigint');
+        return (0, collect_constraints_1.freshVar)(windowFunctionCall.getText(), 'bigint');
     }
     const expr = windowFunctionCall.expr();
     if (expr) {
@@ -1689,7 +1698,7 @@ function traverseExprListParameters(exprList, params, traverseContext) {
         const exprType = traverseExpr(expr, traverseContext);
         const paramType = params.kind == 'FixedLengthParams' ? params.paramsType[paramIndex] : (0, collect_constraints_1.freshVar)(params.paramType, params.paramType);
         traverseContext.constraints.push({
-            expression: expr.text,
+            expression: expr.getText(),
             type1: exprType,
             type2: paramType,
             mostGeneralType: true
@@ -1700,7 +1709,7 @@ function traverseExprListParameters(exprList, params, traverseContext) {
 function walkFunctionParameters(simpleExprFunction, params, traverseContext) {
     var _a, _b;
     const functionName = (0, collect_constraints_1.getFunctionName)(simpleExprFunction);
-    const udfExprList = (_a = simpleExprFunction.functionCall().udfExprList()) === null || _a === void 0 ? void 0 : _a.udfExpr();
+    const udfExprList = (_a = simpleExprFunction.functionCall().udfExprList()) === null || _a === void 0 ? void 0 : _a.udfExpr_list();
     if (udfExprList) {
         const paramTypes = udfExprList
             .filter((undefined, paramIndex) => {
@@ -1710,7 +1719,7 @@ function walkFunctionParameters(simpleExprFunction, params, traverseContext) {
             const expr = inExpr.expr();
             const exprType = traverseExpr(expr, traverseContext);
             traverseContext.constraints.push({
-                expression: expr.text,
+                expression: expr.getText(),
                 type1: exprType,
                 type2: params.kind == 'FixedLengthParams' ? params.paramsType[paramIndex] : (0, collect_constraints_1.freshVar)(params.paramType, params.paramType),
             });
@@ -1718,12 +1727,12 @@ function walkFunctionParameters(simpleExprFunction, params, traverseContext) {
         });
         return paramTypes;
     }
-    const exprList = (_b = simpleExprFunction.functionCall().exprList()) === null || _b === void 0 ? void 0 : _b.expr();
+    const exprList = (_b = simpleExprFunction.functionCall().exprList()) === null || _b === void 0 ? void 0 : _b.expr_list();
     if (exprList) {
         const paramTypes = exprList.map((inExpr, paramIndex) => {
             const inSumExprType = traverseExpr(inExpr, traverseContext);
             traverseContext.constraints.push({
-                expression: inExpr.text,
+                expression: inExpr.getText(),
                 type1: params.kind == 'FixedLengthParams' ? params.paramsType[paramIndex] : (0, collect_constraints_1.freshVar)(params.paramType, params.paramType),
                 type2: inSumExprType,
                 mostGeneralType: true
@@ -1779,10 +1788,10 @@ function isMultipleRowResult(selectStatement, fromColumns) {
         if (!fromClause) {
             return false;
         }
-        if (querySpecs[0].selectItemList().childCount == 1) {
+        if (querySpecs[0].selectItemList().getChildCount() == 1) {
             const selectItem = querySpecs[0].selectItemList().getChild(0);
             //if selectItem = * (TerminalNode) childCount = 0; selectItem.expr() throws exception
-            const expr = selectItem.childCount > 0 ? selectItem.expr() : null;
+            const expr = selectItem.getChildCount() > 0 ? selectItem.expr() : null;
             if (expr) {
                 //SUM, MAX... WITHOUT GROUP BY are multipleRowsResult = false
                 const groupBy = querySpecs[0].groupByClause();
@@ -1791,7 +1800,7 @@ function isMultipleRowResult(selectStatement, fromColumns) {
                 }
             }
         }
-        const joinedTable = (_a = fromClause.tableReferenceList()) === null || _a === void 0 ? void 0 : _a.tableReference()[0].joinedTable();
+        const joinedTable = (_a = fromClause.tableReferenceList()) === null || _a === void 0 ? void 0 : _a.tableReference(0).joinedTable_list();
         if (joinedTable && joinedTable.length > 0) {
             return true;
         }
@@ -1806,10 +1815,10 @@ function isMultipleRowResult(selectStatement, fromColumns) {
 exports.isMultipleRowResult = isMultipleRowResult;
 function isLimitOne(selectStatement) {
     const limitOptions = (0, parse_1.getLimitOptions)(selectStatement);
-    if (limitOptions.length == 1 && limitOptions[0].text == '1') {
+    if (limitOptions.length == 1 && limitOptions[0].getText() == '1') {
         return true;
     }
-    if (limitOptions.length == 2 && limitOptions[1].text == '1') {
+    if (limitOptions.length == 2 && limitOptions[1].getText() == '1') {
         return true;
     }
     return false;
@@ -1833,7 +1842,7 @@ function verifyMultipleResult2(exprContext, fromColumns) {
         return true;
     }
     if (exprContext instanceof ts_mysql_parser_1.ExprAndContext) {
-        const oneIsSingleResult = exprContext.expr().some(expr => verifyMultipleResult2(expr, fromColumns) == false);
+        const oneIsSingleResult = exprContext.expr_list().some(expr => verifyMultipleResult2(expr, fromColumns) == false);
         return oneIsSingleResult == false;
     }
     // if (exprContext instanceof ExprXorContext) {
@@ -1848,7 +1857,7 @@ exports.verifyMultipleResult2 = verifyMultipleResult2;
 function isUniqueKeyComparation(compare, fromColumns) {
     const tokens = (0, select_columns_1.getSimpleExpressions)(compare);
     if (tokens.length == 1 && tokens[0] instanceof ts_mysql_parser_1.SimpleExprColumnRefContext) {
-        const fieldName = (0, select_columns_1.splitName)(tokens[0].text);
+        const fieldName = (0, select_columns_1.splitName)(tokens[0].getText());
         const col = (0, select_columns_1.findColumn)(fieldName, fromColumns);
         if (col.columnKey == 'PRI' || col.columnKey == 'UNI') { //TODO - UNIQUE
             return true; //isUniqueKeyComparation = true