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

Merge branch 'master' into develop 

# Conflicts:
#	moor_generator/pubspec.yaml
This commit is contained in:
Simon Binder 2019-04-14 16:51:37 +02:00
parent 1bb4fe4aab e05303568f
commit 091eff1c4e
No known key found for this signature in database
GPG Key ID: B807FDF954BA00CF
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
moor_generator/lib/src/parser/table_parser.dart
View File

@ -87,8 +87,6 @@ class TableParser extends ParserBase {
final expression = (body as ExpressionFunctionBody).expression;
final parsedPrimaryKey = <SpecifiedColumn>{};
// todo no longer support SetLiteral / MapLiteral when we can afford
// dropping support for older analyzer versions
if (expression is SetOrMapLiteral) {
for (var entry in expression.elements2) {
if (entry is Identifier) {
@ -101,21 +99,6 @@ class TableParser extends ParserBase {
print('Unexpected entry in expression.elements2: $entry');
}
}
// ignore: deprecated_member_use
} else if (expression is MapLiteral) {
for (var entry in expression.entries) {
final key = entry.key as Identifier;
final column =
columns.singleWhere((column) => column.dartGetterName == key.name);
parsedPrimaryKey.add(column);
}
// ignore: deprecated_member_use
} else if (expression is SetLiteral) {
for (var entry in expression.elements) {
final column = columns.singleWhere(
(column) => column.dartGetterName == (entry as Identifier).name);
parsedPrimaryKey.add(column);
}
} else {
generator.errors.add(MoorError(
affectedElement: primaryKeyGetter,

5
moor_generator/pubspec.yaml
View File

@ -10,10 +10,7 @@ environment:
sdk: '>=2.1.2-dev.0.0 <3.0.0'
dependencies:
# for analyzer >=0.36, TableParser._readPrimaryKey needs to be adapted. It already supports SetOrMapLiteral, we just
# need to remove the cases for SetLiteral or MapLiteral (which only exist for backwards compatibility)
# also, built_value doesn't support it yet and everything depends on built_value
analyzer: '>=0.34.0 <0.36.0'
analyzer: '>=0.35.2 <0.37.0'
recase: ^2.0.1
built_value: '>=6.3.0 <6.5.0'
source_gen: ^0.9.4