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

Show available columns when failing to resolve a reference

This commit is contained in:
Simon Binder 2019-12-24 14:07:12 +01:00
parent b79c1c1f57
commit 4a2273c1e8
No known key found for this signature in database
GPG Key ID: 7891917E4147B8C0
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,10 +28,7 @@ class ReferenceResolver extends RecursiveVisitor<void> {
} else {
final column = resultSet.findColumn(e.columnName);
if (column == null) {
context.reportError(AnalysisError(
type: AnalysisErrorType.referencedUnknownColumn,
relevantNode: e,
));
_reportUnknownColumnError(e, columns: resultSet.resolvedColumns);
} else {
e.resolved = column;
}
@ -41,8 +38,7 @@ class ReferenceResolver extends RecursiveVisitor<void> {
final column = _resolveRowIdAlias(e);
if (column == null) {
context.reportError(AnalysisError(
type: AnalysisErrorType.referencedUnknownColumn, relevantNode: e));
_reportUnknownColumnError(e);
} else {
e.resolved = column;
}
@ -53,8 +49,7 @@ class ReferenceResolver extends RecursiveVisitor<void> {
scope.availableColumns.where((c) => c?.name == e.columnName).toSet();
if (columns.isEmpty) {
context.reportError(AnalysisError(
type: AnalysisErrorType.referencedUnknownColumn, relevantNode: e));
_reportUnknownColumnError(e);
} else {
if (columns.length > 1) {
final description =
@ -74,6 +69,19 @@ class ReferenceResolver extends RecursiveVisitor<void> {
visitChildren(e);
}
void _reportUnknownColumnError(Reference e, {Iterable<Column> columns}) {
columns ??= e.scope.availableColumns;
final columnNames = e.scope.availableColumns
.map((c) => c.humanReadableDescription())
.join(', ');
context.reportError(AnalysisError(
type: AnalysisErrorType.referencedUnknownColumn,
relevantNode: e,
message: 'Unknown column. These columns are available: $columnNames',
));
}
Column _resolveRowIdAlias(Reference e) {
// to resolve those aliases when they're not bound to a table, the
// surrounding select statement may only read from one table