Refactor/basic parser (#182)
* feat: replace errorCollector with ParserErrorListener to collect lexer error * refactor: remove useless method in basicParser * feat: correct splitSQLByStatement method * feat: rename parse to parseWithCache and add new parse method * refactor: rename parserTree to parseTree * test: rename parserTree to parseTree * refactor: rename parserError to parseError * feat: export ErrorHandler type * feat: use errorhandler form params * test: basic parser unit tests * style: lint via prettier
This commit is contained in:
@ -8,7 +8,7 @@ describe('Flink SQL Listener Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new FlinkSQL();
|
||||
|
||||
const parserTree = parser.parse(sql);
|
||||
const parseTree = parser.parse(sql);
|
||||
|
||||
test('Listener enterTableName', async () => {
|
||||
let result = '';
|
||||
@ -19,7 +19,7 @@ describe('Flink SQL Listener Tests', () => {
|
||||
}
|
||||
const listenTableName = new MyListener();
|
||||
|
||||
await parser.listen(listenTableName as ParseTreeListener, parserTree);
|
||||
await parser.listen(listenTableName as ParseTreeListener, parseTree);
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('Flink SQL Visitor Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new FlinkSQL();
|
||||
|
||||
const parserTree = parser.parse(sql, (error) => {
|
||||
const parseTree = parser.parse(sql, (error) => {
|
||||
console.log('Parse error:', error);
|
||||
});
|
||||
|
||||
@ -25,7 +25,7 @@ describe('Flink SQL Visitor Tests', () => {
|
||||
};
|
||||
}
|
||||
const visitor: any = new MyVisitor();
|
||||
visitor.visit(parserTree);
|
||||
visitor.visit(parseTree);
|
||||
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('Generic SQL Listener Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new GenericSQL();
|
||||
|
||||
const parserTree = parser.parse(sql);
|
||||
const parseTree = parser.parse(sql);
|
||||
|
||||
test('Listener enterTableName', async () => {
|
||||
let result = '';
|
||||
@ -18,7 +18,7 @@ describe('Generic SQL Listener Tests', () => {
|
||||
}
|
||||
const listenTableName: any = new MyListener();
|
||||
|
||||
await parser.listen(listenTableName as ParseTreeListener, parserTree);
|
||||
await parser.listen(listenTableName as ParseTreeListener, parseTree);
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('Generic SQL Visitor Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new GenericSQL();
|
||||
|
||||
const parserTree = parser.parse(sql, (error) => {
|
||||
const parseTree = parser.parse(sql, (error) => {
|
||||
console.log('Parse error:', error);
|
||||
});
|
||||
|
||||
@ -23,7 +23,7 @@ describe('Generic SQL Visitor Tests', () => {
|
||||
};
|
||||
}
|
||||
const visitor = new MyVisitor();
|
||||
visitor.visit(parserTree);
|
||||
visitor.visit(parseTree);
|
||||
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
|
@ -8,7 +8,7 @@ describe('HiveSQL Listener Tests', () => {
|
||||
test('Listener enterSelectList', async () => {
|
||||
const expectTableName = 'username';
|
||||
const sql = `select ${expectTableName} from tablename where inc_day='20190601' limit 1000;`;
|
||||
const parserTree = parser.parse(sql);
|
||||
const parseTree = parser.parse(sql);
|
||||
|
||||
let result = '';
|
||||
class MyListener implements HiveSqlParserListener {
|
||||
@ -18,12 +18,12 @@ describe('HiveSQL Listener Tests', () => {
|
||||
}
|
||||
const listenTableName = new MyListener();
|
||||
|
||||
await parser.listen(listenTableName as ParseTreeListener, parserTree as ProgramContext);
|
||||
await parser.listen(listenTableName as ParseTreeListener, parseTree as ProgramContext);
|
||||
expect(result).toBe(expectTableName.toUpperCase());
|
||||
});
|
||||
test('Listener enterCreateTable', async () => {
|
||||
const sql = `drop table table_name;`;
|
||||
const parserTree = parser.parse(sql);
|
||||
const parseTree = parser.parse(sql);
|
||||
let result = '';
|
||||
class MyListener implements HiveSqlParserListener {
|
||||
enterDropTableStatement(ctx) {
|
||||
@ -32,7 +32,7 @@ describe('HiveSQL Listener Tests', () => {
|
||||
}
|
||||
const listenTableName = new MyListener();
|
||||
|
||||
await parser.listen(listenTableName as ParseTreeListener, parserTree as ProgramContext);
|
||||
await parser.listen(listenTableName as ParseTreeListener, parseTree as ProgramContext);
|
||||
expect(result).toBe('DROPTABLETABLE_NAME');
|
||||
});
|
||||
});
|
||||
|
@ -8,7 +8,7 @@ describe('HiveSQL Visitor Tests', () => {
|
||||
const sql = `select citycode,tc,inc_day from ${expectTableName} where inc_day='20190501' limit 100;`;
|
||||
const parser = new HiveSQL();
|
||||
|
||||
const parserTree = parser.parse(sql, (error) => {
|
||||
const parseTree = parser.parse(sql, (error) => {
|
||||
console.log('Parse error:', error);
|
||||
});
|
||||
|
||||
@ -25,7 +25,7 @@ describe('HiveSQL Visitor Tests', () => {
|
||||
}
|
||||
|
||||
const visitor = new MyVisitor();
|
||||
visitor.visit(parserTree as ProgramContext);
|
||||
visitor.visit(parseTree as ProgramContext);
|
||||
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
|
@ -8,7 +8,7 @@ describe('PostgresSQL Listener Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new PostgresSQL();
|
||||
|
||||
const parserTree = parser.parse(sql);
|
||||
const parseTree = parser.parse(sql);
|
||||
|
||||
test('Listener enterTableName', async () => {
|
||||
let result = '';
|
||||
@ -19,7 +19,7 @@ describe('PostgresSQL Listener Tests', () => {
|
||||
}
|
||||
const listenTableName = new MyListener();
|
||||
|
||||
await parser.listen(listenTableName as ParseTreeListener, parserTree);
|
||||
await parser.listen(listenTableName as ParseTreeListener, parseTree);
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('Generic SQL Visitor Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new PostgresSQL();
|
||||
|
||||
const parserTree = parser.parse(sql, (error) => {
|
||||
const parseTree = parser.parse(sql, (error) => {
|
||||
console.log('Parse error:', error);
|
||||
});
|
||||
|
||||
@ -26,7 +26,7 @@ describe('Generic SQL Visitor Tests', () => {
|
||||
}
|
||||
}
|
||||
const visitor: any = new MyVisitor();
|
||||
visitor.visit(parserTree);
|
||||
visitor.visit(parseTree);
|
||||
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('PLSQL Listener Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new PLSQL();
|
||||
|
||||
const parserTree = parser.parse(sql);
|
||||
const parseTree = parser.parse(sql);
|
||||
|
||||
test('Listener enterTableName', async () => {
|
||||
let result = '';
|
||||
@ -18,7 +18,7 @@ describe('PLSQL Listener Tests', () => {
|
||||
}
|
||||
const listenTableName = new MyListener();
|
||||
|
||||
await parser.listen(listenTableName as ParseTreeListener, parserTree);
|
||||
await parser.listen(listenTableName as ParseTreeListener, parseTree);
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('PLSQL Visitor Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new PLSQL();
|
||||
|
||||
const parserTree = parser.parse(sql);
|
||||
const parseTree = parser.parse(sql);
|
||||
|
||||
test('Visitor visitTable_ref_list', () => {
|
||||
let result = '';
|
||||
@ -20,7 +20,7 @@ describe('PLSQL Visitor Tests', () => {
|
||||
};
|
||||
}
|
||||
const visitor: any = new MyVisitor();
|
||||
visitor.visit(parserTree);
|
||||
visitor.visit(parseTree);
|
||||
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('Spark SQL Listener Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new SparkSQL();
|
||||
|
||||
const parserTree = parser.parse(sql);
|
||||
const parseTree = parser.parse(sql);
|
||||
|
||||
test('Listener exitRelationPrimary', () => {
|
||||
let result = '';
|
||||
@ -18,7 +18,7 @@ describe('Spark SQL Listener Tests', () => {
|
||||
}
|
||||
const listenTableName = new MyListener();
|
||||
|
||||
parser.listen(listenTableName as ParseTreeListener, parserTree);
|
||||
parser.listen(listenTableName as ParseTreeListener, parseTree);
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('Spark SQL Visitor Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new SparkSQL();
|
||||
|
||||
const parserTree = parser.parse(sql, (error) => {
|
||||
const parseTree = parser.parse(sql, (error) => {
|
||||
console.log('Parse error:', error);
|
||||
});
|
||||
|
||||
@ -25,7 +25,7 @@ describe('Spark SQL Visitor Tests', () => {
|
||||
};
|
||||
}
|
||||
const visitor = new MyVisitor();
|
||||
visitor.visit(parserTree);
|
||||
visitor.visit(parseTree);
|
||||
|
||||
expect(visitor.result).toBe(expectTableName);
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('trino SQL Listener Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new trinoSQL();
|
||||
|
||||
const parserTree = parser.parse(sql);
|
||||
const parseTree = parser.parse(sql);
|
||||
|
||||
test('Listener enterTableName', async () => {
|
||||
let result = '';
|
||||
@ -18,7 +18,7 @@ describe('trino SQL Listener Tests', () => {
|
||||
}
|
||||
const listenTableName = new MyListener();
|
||||
|
||||
await parser.listen(listenTableName as ParseTreeListener, parserTree);
|
||||
await parser.listen(listenTableName as ParseTreeListener, parseTree);
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
});
|
||||
|
@ -7,7 +7,7 @@ describe('trino SQL Visitor Tests', () => {
|
||||
const sql = `select id,name,sex from ${expectTableName};`;
|
||||
const parser = new trinoSQL();
|
||||
|
||||
const parserTree = parser.parse(sql, (error) => {
|
||||
const parseTree = parser.parse(sql, (error) => {
|
||||
console.log('Parse error:', error);
|
||||
});
|
||||
|
||||
@ -22,7 +22,7 @@ describe('trino SQL Visitor Tests', () => {
|
||||
};
|
||||
}
|
||||
const visitor: any = new MyVisitor();
|
||||
visitor.visit(parserTree);
|
||||
visitor.visit(parseTree);
|
||||
|
||||
expect(result).toBe(expectTableName);
|
||||
});
|
||||
|
Reference in New Issue
Block a user