pr review comments

Author: paco-valdez

packages/cubejs-schema-compiler/src/parser/SqlParser.ts

@@ -64,18 +64,15 @@ export class SqlParser {
   protected static sqlUpperCase(sql) {
     let result = '';
     let openChar;
-    let inComment = false;
-    let commentType = '';
+    let commentType: ('--' | '/*' | '') = '';
 
     for (let i = 0; i < sql.length; i++) {
-      if (inComment) {
+      if (commentType) {
         if (commentType === '--' && (sql[i] === '\n' || sql[i] === '\r')) {
-          inComment = false;
           commentType = '';
         } else if (commentType === '/*' && sql[i] === '*' && sql[i + 1] === '/') {
           result += sql[i];
           i++;
-          inComment = false;
           commentType = '';
         }
         result += sql[i];
@@ -89,18 +86,16 @@ export class SqlParser {
         result += sql[i];
       } else if (sql[i] === '-' && sql[i + 1] === '-') {
         // Check for start of single-line comment
-        inComment = true;
         commentType = '--';
         result += sql[i];
       } else if (sql[i] === '/' && sql[i + 1] === '*') {
         // Check for start of multi-line comment
-        inComment = true;
         commentType = '/*';
         result += sql[i];
       } else if (sql[i] === '\'' || sql[i] === '"' || sql[i] === '`') {
         // Check for string literals
         openChar = sql[i];
-        result += sql[i].toUpperCase();
+        result += sql[i];
       } else {
         // Regular character - convert to uppercase
         result += sql[i].toUpperCase();

packages/cubejs-schema-compiler/test/unit/sql-parser.test.ts

@@ -109,7 +109,23 @@ describe('SqlParser', () => {
   });
 
   it('sql with multiline comment containing question mark', () => {
-    const sqlParser = new SqlParser('SELECT 1 as test FROM table_name /* this is comment that kaputs Cube -> ? */');
+    const sqlParser = new SqlParser(`SELECT 1 as test FROM table_name 
+    /* this is a real
+       multiline comment that 
+       contains ? character */`);
     expect(sqlParser.canParse()).toEqual(true);
   });
+
+  it('numeric literal in SELECT with table alias extraction', () => {
+    const sqlParser = new SqlParser(`SELECT 1 as test_literal, 2.5 as decimal_literal
+      FROM users u 
+      WHERE u.status = 'active' AND u.created_at > '2024-01-01'`);
+    
+    expect(sqlParser.canParse()).toEqual(true);
+    expect(sqlParser.isSimpleAsteriskQuery()).toEqual(false);
+    
+    // Verify table alias extraction still works after grammar changes
+    const extractedConditions = sqlParser.extractWhereConditions('t');
+    expect(extractedConditions).toEqual(`t.status = 'active' AND t.created_at > '2024-01-01'`);
+  });
 });