AMT-Cheif
/
drift
mirror of https://github.com/AMT-Cheif/drift.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Parse comma separated tables as proper join (#453)

This commit is contained in:
Simon Binder 2020-03-22 11:51:39 +01:00
parent d533a0a254
commit 1a2d3bdee7
No known key found for this signature in database
GPG Key ID: 7891917E4147B8C0
18 changed files with 123 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sqlparser/CHANGELOG.md
View File

@ -1,6 +1,8 @@
## unreleased
- Remove `SqlEngine.withOptions` constructor - just use the regular one
- Changed `SelectStatement.from` from `List<Queryable>` to `Queryable?`. Selecting from multiple
tables with a comma will now be parsed as a `JoinClause`.
## 0.7.0

4
sqlparser/lib/src/analysis/steps/column_resolver.dart
View File

@ -170,8 +170,8 @@ class ColumnResolver extends RecursiveVisitor<void, void> {
void _resolveSelect(SelectStatement s) {
final availableColumns = <Column>[];
for (final queryable in s.from) {
_handle(queryable, availableColumns);
if (s.from != null) {
_handle(s.from, availableColumns);
}
final usedColumns = <Column>[];

4
sqlparser/lib/src/analysis/steps/reference_resolver.dart
View File

@ -89,11 +89,11 @@ class ReferenceResolver extends RecursiveVisitor<void, void> {
orElse: () => null) as SelectStatement;
if (select == null) return null;
if (select.from.length != 1 || select.from.single is! TableReference) {
if (select.from is! TableReference) {
return null;
}
final table = (select.from.single as TableReference).resolved as Table;
final table = (select.from as TableReference).resolved as Table;
if (table == null) return null;
// table.findColumn contains logic to resolve row id aliases

4
sqlparser/lib/src/ast/common/queryables.dart
View File

@ -116,13 +116,13 @@ class Join extends AstNode {
final bool natural;
final JoinOperator operator;
final TableOrSubquery query;
final JoinConstraint constraint;
final JoinConstraint /*?*/ constraint;
Join(
{this.natural = false,
@required this.operator,
@required this.query,
@required this.constraint});
this.constraint});
@override
Iterable<AstNode> get childNodes {

4
sqlparser/lib/src/ast/statements/select.dart
View File

@ -13,7 +13,7 @@ class SelectStatement extends BaseSelectStatement
implements StatementWithWhere {
final bool distinct;
final List<ResultColumn> columns;
final List<Queryable> from;
final Queryable /*?*/ from;
@override
final Expression where;
@ -45,7 +45,7 @@ class SelectStatement extends BaseSelectStatement
return [
if (withClause != null) withClause,
...columns,
if (from != null) ...from,
if (from != null) from,
if (where != null) where,
if (groupBy != null) groupBy,
for (var windowDecl in windowDeclarations) windowDecl.definition,

52
sqlparser/lib/src/reader/parser/crud.dart
View File

@ -1,5 +1,14 @@
part of 'parser.dart';
const _startJoinOperators = [
TokenType.natural,
TokenType.left,
TokenType.inner,
TokenType.cross,
TokenType.join,
TokenType.comma,
];
mixin CrudParser on ParserBase {
CrudStatement _crud() {
final withClause = _withClause();
@ -235,25 +244,14 @@ mixin CrudParser on ParserBase {
}
}
List<Queryable> _from() {
if (!_matchOne(TokenType.from)) return [];
Queryable /*?*/ _from() {
if (!_matchOne(TokenType.from)) return null;
// Can either be a list of <TableOrSubquery> or a join. Joins also start
// with a TableOrSubquery, so let's first parse that.
final start = _tableOrSubquery();
// parse join, if it is one
final join = _joinClause(start);
if (join != null) {
return [join];
}
// not a join. Keep the TableOrSubqueries coming!
final queries = [start];
while (_matchOne(TokenType.comma)) {
queries.add(_tableOrSubquery());
}
return queries;
// parse join, if there is one
return _joinClause(start) ?? start;
}
TableOrSubquery _tableOrSubquery() {
@ -306,7 +304,7 @@ mixin CrudParser on ParserBase {
}
JoinClause _joinClause(TableOrSubquery start) {
var operator = _parseJoinOperatorNoComma();
var operator = _parseJoinOperator();
if (operator == null) {
return null;
}
@ -341,24 +339,21 @@ mixin CrudParser on ParserBase {
)..setSpan(first, _previous));
// parse the next operator, if there is more than one join
if (_matchOne(TokenType.comma)) {
operator = [TokenType.comma];
} else {
operator = _parseJoinOperatorNoComma();
}
operator = _parseJoinOperator();
}
return JoinClause(primary: start, joins: joins)
..setSpan(start.first, _previous);
}
/// Parses https://www.sqlite.org/syntax/join-operator.html, minus the comma.
List<TokenType> _parseJoinOperatorNoComma() {
if (_match(_startOperators)) {
/// Parses https://www.sqlite.org/syntax/join-operator.html
List<TokenType> _parseJoinOperator() {
if (_match(_startJoinOperators)) {
final operators = [_previous.type];
if (_previous.type == TokenType.join) {
// just join, without any specific operators
if (_previous.type == TokenType.join ||
_previous.type == TokenType.comma) {
// just join or comma, without any specific operators
return operators;
} else {
// natural is a prefix, another operator can follow.
@ -379,7 +374,7 @@ mixin CrudParser on ParserBase {
}
/// Parses https://www.sqlite.org/syntax/join-constraint.html
JoinConstraint _joinConstraint() {
JoinConstraint /*?*/ _joinConstraint() {
if (_matchOne(TokenType.on)) {
return OnConstraint(expression: expression());
} else if (_matchOne(TokenType.using)) {
@ -395,8 +390,9 @@ mixin CrudParser on ParserBase {
_consume(TokenType.rightParen, 'Expected an closing paranthesis');
return UsingConstraint(columnNames: columnNames);
} else {
return null;
}
_error('Expected a constraint with ON or USING');
}
/// Parses a where clause if there is one at the current position

8
sqlparser/lib/src/reader/parser/parser.dart
View File

@ -22,14 +22,6 @@ const _binaryOperators = [
TokenType.pipe,
];
const _startOperators = [
TokenType.natural,
TokenType.left,
TokenType.inner,
TokenType.cross,
TokenType.join,
];
class ParsingError implements Exception {
final Token token;
final String message;

2
sqlparser/test/analysis/reference_resolver_test.dart
View File

@ -31,7 +31,7 @@ void main() {
final firstColumn = select.columns[0] as ExpressionResultColumn;
final secondColumn = select.columns[1] as ExpressionResultColumn;
final from = select.from[0] as TableReference;
final from = select.from as TableReference;
expect((firstColumn.expression as Reference).resolved, id);
expect((secondColumn.expression as Reference).resolved, content);

2
sqlparser/test/parser/create_trigger_test.dart
View File

@ -12,7 +12,7 @@ final _block = Block([
]),
SelectStatement(
columns: [StarResultColumn()],
from: [TableReference('tbl')],
from: TableReference('tbl'),
),
]);

8
sqlparser/test/parser/expression_test.dart
View File

@ -77,9 +77,7 @@ final Map<String, Expression> _testCases = {
ExistsExpression(
select: SelectStatement(
columns: [StarResultColumn(null)],
from: [
TableReference('demo', null),
],
from: TableReference('demo', null),
),
),
),
@ -114,9 +112,7 @@ final Map<String, Expression> _testCases = {
expression: Reference(columnName: 'col'),
)
],
from: [
TableReference('tbl', null),
],
from: TableReference('tbl', null),
),
),
),

8
sqlparser/test/parser/inline_dart_test.dart
View File

@ -9,7 +9,7 @@ void main() {
r'SELECT * FROM tbl LIMIT $limit',
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
limit: DartLimitPlaceholder(name: 'limit'),
),
moorMode: true,
@ -21,7 +21,7 @@ void main() {
r'SELECT * FROM tbl LIMIT $amount OFFSET 3',
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
limit: Limit(
count: DartExpressionPlaceholder(name: 'amount'),
offsetSeparator: token(TokenType.offset),
@ -37,7 +37,7 @@ void main() {
r'SELECT * FROM tbl ORDER BY $term, $expr DESC',
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
orderBy: OrderBy(
terms: [
DartOrderingTermPlaceholder(name: 'term'),
@ -57,7 +57,7 @@ void main() {
r'SELECT * FROM tbl ORDER BY $order',
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
orderBy: DartOrderByPlaceholder(name: 'order'),
),
moorMode: true,

2
sqlparser/test/parser/insert_test.dart
View File

@ -48,7 +48,7 @@ void main() {
source: SelectInsertSource(
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
),
),
),

8
sqlparser/test/parser/moor_file_test.dart
View File

@ -58,7 +58,7 @@ void main() {
SimpleName('all'),
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
where: DartExpressionPlaceholder(name: 'predicate'),
),
),
@ -66,7 +66,7 @@ void main() {
SpecialStatementIdentifier('special'),
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
),
),
DeclaredStatement(
@ -116,7 +116,7 @@ void main() {
final engine = SqlEngine(EngineOptions(useMoorExtensions: true));
final result = engine.parseMoorFile('''
worksByComposer:
SELECT DISTINCT A.* FROM works A, works B ON A.id = B.part_of
SELECT DISTINCT A.* FROM works A, works B ON A.id =
WHERE A.composer = :id OR B.composer = :id;
''');
@ -124,6 +124,6 @@ SELECT DISTINCT A.* FROM works A, works B ON A.id = B.part_of
expect(
result.errors.single,
isA<ParsingError>()
.having((e) => e.token.lexeme, 'token.lexeme', 'ON'));
.having((e) => e.token.lexeme, 'token.lexeme', 'WHERE'));
});
}

6
sqlparser/test/parser/multiple_statements.dart
View File

@ -29,7 +29,7 @@ void main() {
SimpleName('b'),
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
),
),
]),
@ -48,7 +48,7 @@ void main() {
SimpleName('b'),
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
),
),
);
@ -78,7 +78,7 @@ void main() {
SimpleName('query'),
SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
),
),
);

4
sqlparser/test/parser/select/common_table_expression_test.dart
View File

@ -47,7 +47,7 @@ void main() {
),
),
],
from: [TableReference('cnt')],
from: TableReference('cnt'),
limit: Limit(
count: NumericLiteral(
1000000,
@ -64,7 +64,7 @@ void main() {
columns: [
ExpressionResultColumn(expression: Reference(columnName: 'x')),
],
from: [TableReference('cnt')],
from: TableReference('cnt'),
),
);
});

2
sqlparser/test/parser/select/compound_test.dart
View File

@ -10,7 +10,7 @@ void main() {
CompoundSelectStatement(
base: SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
),
additional: [
CompoundSelectPart(

98
sqlparser/test/parser/select/from_test.dart
View File

@ -5,13 +5,9 @@ import 'package:sqlparser/src/utils/ast_equality.dart';
import '../utils.dart';
void _enforceFrom(SelectStatement stmt, List<Queryable> expected) {
void _enforceFrom(SelectStatement stmt, Queryable expected) {
enforceHasSpan(stmt);
expect(stmt.from.length, expected.length);
for (var i = 0; i < stmt.from.length; i++) {
enforceEqual(stmt.from[i], expected[i]);
}
enforceEqual(stmt.from, expected);
}
void main() {
@ -20,7 +16,7 @@ void main() {
final stmt =
SqlEngine().parse('SELECT * FROM tbl').rootNode as SelectStatement;
enforceEqual(stmt.from.single, TableReference('tbl', null));
enforceEqual(stmt.from, TableReference('tbl', null));
});
test('from more than one table', () {
@ -30,10 +26,37 @@ void main() {
_enforceFrom(
stmt,
[
TableReference('tbl', 'test'),
TableReference('table2', null),
],
JoinClause(
primary: TableReference('tbl', 'test'),
joins: [
Join(
operator: JoinOperator.comma,
query: TableReference('table2', null),
),
],
),
);
});
test('more than one table with ON constraint', () {
final stmt = SqlEngine()
.parse('SELECT * FROM tbl AS test, table2 ON TRUE')
.rootNode as SelectStatement;
_enforceFrom(
stmt,
JoinClause(
primary: TableReference('tbl', 'test'),
joins: [
Join(
operator: JoinOperator.comma,
query: TableReference('table2', null),
constraint: OnConstraint(
expression: BooleanLiteral.withTrue(token(TokenType.$true)),
),
),
],
),
);
});
@ -45,17 +68,22 @@ void main() {
_enforceFrom(
stmt,
[
TableReference('table1', null),
SelectStatementAsSource(
statement: SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('table2', null)],
where: Reference(columnName: 'a'),
JoinClause(
primary: TableReference('table1', null),
joins: [
Join(
operator: JoinOperator.comma,
query: SelectStatementAsSource(
statement: SelectStatement(
columns: [StarResultColumn(null)],
from: TableReference('table2', null),
where: Reference(columnName: 'a'),
),
as: 'inner',
),
),
as: 'inner',
),
],
],
),
);
});
@ -66,7 +94,8 @@ void main() {
'LEFT OUTER JOIN table3 ON TRUE')
.rootNode as SelectStatement;
_enforceFrom(stmt, [
_enforceFrom(
stmt,
JoinClause(
primary: TableReference('table1', null),
joins: [
@ -84,7 +113,7 @@ void main() {
),
],
),
]);
);
});
test('table valued function', () {
@ -101,15 +130,20 @@ WHERE json_each.value LIKE '704-%';
expression: Reference(tableName: 'user', columnName: 'name'),
),
],
from: [
TableReference('user'),
TableValuedFunction(
'json_each',
ExprFunctionParameters(parameters: [
Reference(tableName: 'user', columnName: 'phone')
]),
),
],
from: JoinClause(
primary: TableReference('user'),
joins: [
Join(
operator: JoinOperator.comma,
query: TableValuedFunction(
'json_each',
ExprFunctionParameters(parameters: [
Reference(tableName: 'user', columnName: 'phone')
]),
),
),
],
),
where: StringComparisonExpression(
left: Reference(tableName: 'json_each', columnName: 'value'),
operator: token(TokenType.like),

10
sqlparser/test/parser/select/generic_test.dart
View File

@ -32,18 +32,16 @@ final Map<String, AstNode> testCases = {
expression: SubQuery(
select: SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('table2', null)],
from: TableReference('table2', null),
),
),
),
],
from: [
TableReference('tbl', null),
],
from: TableReference('tbl', null),
),
'SELECT * FROM tbl WHERE id IN ()': SelectStatement(
columns: [StarResultColumn(null)],
from: [TableReference('tbl', null)],
from: TableReference('tbl', null),
where: InExpression(
left: Reference(columnName: 'id'),
inside: Tuple(expressions: []),
@ -53,7 +51,7 @@ final Map<String, AstNode> testCases = {
columns: [
ExpressionResultColumn(expression: Reference(columnName: 'rowid')),
],
from: [TableReference('tbl')],
from: TableReference('tbl'),
),
};