Skip to content

Commit ee864c3

Browse files
committed
Fix more tests
1 parent dd01684 commit ee864c3

File tree

6 files changed

+18
-25
lines changed

6 files changed

+18
-25
lines changed

drift/lib/src/dsl/table.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ class UseRowClass {
509509
///
510510
/// For details, see the class documentation on [UseRowClass].
511511
const UseRowClass(this.type,
512-
{this.constructor = '', this.generateInsertable = false});
512+
{this.constructor = 'new', this.generateInsertable = false});
513513
}
514514

515515
/// An annotation specifying view properties

drift_dev/lib/src/analysis/resolver/dart/helper.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import 'package:analyzer/dart/element/type.dart';
77
import 'package:analyzer/dart/element/type_provider.dart';
88
import 'package:analyzer/dart/element/type_system.dart';
99
import 'package:collection/collection.dart';
10-
import 'package:path/path.dart' as p;
1110

1211
import '../../backend.dart';
1312
import '../../driver/error.dart';

drift_dev/lib/src/analysis/resolver/drift/element_resolver.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ abstract class DriftElementResolver<T extends DiscoveredElement>
169169
return null;
170170
} else {
171171
return validateExistingClass(columns, foundDartClass,
172-
source.constructorName ?? '', false, this, knownTypes);
172+
source.constructorName ?? 'new', false, this, knownTypes);
173173
}
174174
}
175175

drift_dev/lib/src/analysis/resolver/queries/existing_row_class.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ class MatchExistingTypeForQuery {
199199
// into the classes' default constructor.
200200
final element = desiredType.element3;
201201

202-
final constructor = desiredType.lookUpConstructor2(
203-
constructorName ?? '', element.library2);
202+
final constructor =
203+
desiredType.lookUpConstructor2(constructorName, element.library2);
204204
if (constructor == null) {
205205
if (constructorName == null) {
206206
reportError(

drift_dev/lib/src/analysis/resolver/shared/dart_types.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ ExistingRowClass? validateExistingClass(
2929
LocalElementResolver step,
3030
KnownDriftTypes knownTypes,
3131
) {
32+
if (constructor == '') {
33+
constructor = 'new';
34+
}
35+
3236
final desiredClass = dartClass.classElement;
3337
final library = desiredClass.library2;
3438
var isAsyncFactory = false;
@@ -95,7 +99,7 @@ ExistingRowClass? validateExistingClass(
9599
}
96100

97101
if (ctor == null) {
98-
final msg = constructor == ''
102+
final msg = constructor == 'new'
99103
? 'The desired data class must have an unnamed constructor'
100104
: 'The desired data class does not have a constructor named '
101105
'$constructor';

drift_dev/test/writer/writer_test.dart

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:build/build.dart';
22
import 'package:build_test/build_test.dart';
33
import 'package:test/test.dart';
44

5-
import '../analysis/test_utils.dart';
65
import '../utils.dart';
76

87
void main() {
@@ -78,25 +77,17 @@ class Database {}
7877
),
7978
contains(r'''
8079
return (
81-
id:
82-
attachedDatabase.typeMapping.read(
83-
DriftSqlType.int,
84-
data['${effectivePrefix}id'],
85-
)!,
86-
name:
87-
attachedDatabase.typeMapping.read(
88-
DriftSqlType.string,
89-
data['${effectivePrefix}name'],
90-
)!,
91-
birthDate: attachedDatabase.typeMapping.read(
92-
DriftSqlType.dateTime,
93-
data['${effectivePrefix}birth_date'],
94-
),
80+
id: attachedDatabase.typeMapping
81+
.read(DriftSqlType.int, data['${effectivePrefix}id'])!,
82+
name: attachedDatabase.typeMapping
83+
.read(DriftSqlType.string, data['${effectivePrefix}name'])!,
84+
birthDate: attachedDatabase.typeMapping
85+
.read(DriftSqlType.dateTime, data['${effectivePrefix}birth_date']),
9586
);
9687
'''),
9788
))
9889
}, result.dartOutputs, result.writer);
99-
}, skip: requireDart('3.0.0-dev'));
90+
});
10091

10192
test(
10293
'references nullable variant of converter on non-nullable column',
@@ -265,9 +256,8 @@ class Database {}
265256

266257
checkOutputs(
267258
{
268-
'a|lib/a.drift.dart': decodedMatches(contains('Index(\n'
269-
" 'users_name',\n"
270-
" 'CREATE INDEX users_name ON users (name)',"))
259+
'a|lib/a.drift.dart': decodedMatches(contains("Index('users_name', "
260+
"'CREATE INDEX users_name ON users (name)'"))
271261
},
272262
result.dartOutputs,
273263
result.writer,

0 commit comments

Comments
 (0)