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

Support 2.2 (and Dart 2.2. only :P)

This commit is contained in:
Simon Binder 2019-03-01 20:23:14 +01:00
parent e43a5dea60
commit 6b08bef82c
13 changed files with 100 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.idea/libraries/Dart_Packages.xml
View File

@ -6,8 +6,8 @@
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.34.3/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.35.1/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.35.2/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.35.3/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.35.3/lib" />
</list>
</value>
</entry>
@ -63,7 +63,7 @@
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_daemon-0.2.3/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_daemon-0.4.0/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_daemon-0.4.1/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/build_daemon-0.4.1/lib" />
</list>
</value>
@ -81,7 +81,7 @@
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.3/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.7/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.8/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.8/lib" />
</list>
</value>
@ -113,7 +113,7 @@
<entry key="built_value">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/built_value-6.3.0/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/built_value-6.3.1/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/built_value-6.3.1/lib" />
</list>
</value>
@ -121,7 +121,7 @@
<entry key="built_value_generator">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/built_value_generator-6.3.0/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/built_value_generator-6.3.1/lib" />
</list>
</value>
</entry>
@ -214,8 +214,8 @@
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.9+1/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.11/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.12/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.13/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.13/lib" />
</list>
</value>
</entry>
@ -302,8 +302,8 @@
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.9+1/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.11/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.12/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.13/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.13/lib" />
</list>
</value>
</entry>
@ -371,7 +371,7 @@
<entry key="package_resolver">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.6/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.10/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.10/lib" />
</list>
</value>
@ -387,7 +387,7 @@
<entry key="pedantic">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pedantic-1.4.0/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pedantic-1.5.0/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.4.0/lib" />
</list>
</value>
@ -509,7 +509,7 @@
<entry key="source_span">
<value>
<list>
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.4/lib" />
<option value="$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.5/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.4.1/lib" />
<option value="$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.4/lib" />
</list>
@ -661,7 +661,7 @@
</properties>
<CLASSES>
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.34.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.35.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer-0.35.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/analyzer_plugin-0.0.1-alpha.6/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/args-1.5.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
@ -670,17 +670,17 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build-1.1.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_config-0.3.1+4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_daemon-0.2.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_daemon-0.4.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_daemon-0.4.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_resolvers-0.2.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_resolvers-1.0.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.7/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner-1.2.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner_core-2.0.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_runner_core-2.0.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/build_test-0.10.6/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/built_collection-4.1.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/built_value-6.3.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/built_value_generator-6.3.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/built_value-6.3.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/built_value_generator-6.3.1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/charcode-1.1.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/code_builder-3.2.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/collection-1.14.11/lib" />
@ -689,7 +689,7 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/csslib-0.14.6/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/dart_style-1.2.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/fixnum-0.10.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.11/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.13/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.9+1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/glob-1.1.7/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/graphs-0.2.0/lib" />
@ -701,7 +701,7 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/js-0.6.1+1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_annotation-2.0.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/json_rpc_2-2.0.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.11/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.13/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.9+1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3+1/lib" />
@ -711,9 +711,9 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/multi_server_socket-1.0.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/node_preamble-1.4.4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_config-1.0.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.6/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/package_resolver-1.0.10/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/path-1.6.2/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pedantic-1.4.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pedantic-1.5.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/plugin-0.2.0+3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pool-1.4.0/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.2/lib" />
@ -727,7 +727,7 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_gen-0.9.4+1/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_map_stack_trace-1.1.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_maps-0.10.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.4/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/source_span-1.5.5/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.9.3/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_channel-1.6.8/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/stream_transform-0.0.15/lib" />
@ -743,7 +743,7 @@
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+10/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/web_socket_channel-1.0.9/lib" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.dartlang.org/yaml-2.1.15/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.35.2/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.35.3/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.5.1/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.0.8/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-1.0.4/lib" />
@ -764,7 +764,7 @@
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/cupertino_icons-0.1.2/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/dart_style-1.2.3/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/fixnum-0.10.9/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.12/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/front_end-0.1.13/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/glob-1.1.7/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/graphs-0.2.0/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/html-0.13.3+3/lib" />
@ -774,7 +774,7 @@
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/io-0.3.3/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/js-0.6.1+1/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/json_annotation-2.0.0/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.12/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/kernel-0.3.13/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/logging-0.11.3+2/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.3+1/lib" />
<root url="file://$USER_HOME$/Android/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.1.6/lib" />

39
.idea/libraries/Dart_SDK.xml
View File

@ -1,25 +1,26 @@
<component name="libraryTable">
<library name="Dart SDK">
<CLASSES>
<root url="file:///opt/dart-sdk/lib/async" />
<root url="file:///opt/dart-sdk/lib/cli" />
<root url="file:///opt/dart-sdk/lib/collection" />
<root url="file:///opt/dart-sdk/lib/convert" />
<root url="file:///opt/dart-sdk/lib/core" />
<root url="file:///opt/dart-sdk/lib/developer" />
<root url="file:///opt/dart-sdk/lib/html" />
<root url="file:///opt/dart-sdk/lib/indexed_db" />
<root url="file:///opt/dart-sdk/lib/io" />
<root url="file:///opt/dart-sdk/lib/isolate" />
<root url="file:///opt/dart-sdk/lib/js" />
<root url="file:///opt/dart-sdk/lib/js_util" />
<root url="file:///opt/dart-sdk/lib/math" />
<root url="file:///opt/dart-sdk/lib/mirrors" />
<root url="file:///opt/dart-sdk/lib/svg" />
<root url="file:///opt/dart-sdk/lib/typed_data" />
<root url="file:///opt/dart-sdk/lib/web_audio" />
<root url="file:///opt/dart-sdk/lib/web_gl" />
<root url="file:///opt/dart-sdk/lib/web_sql" />
<root url="file:///opt/dart-sdk-dev/lib/async" />
<root url="file:///opt/dart-sdk-dev/lib/cli" />
<root url="file:///opt/dart-sdk-dev/lib/collection" />
<root url="file:///opt/dart-sdk-dev/lib/convert" />
<root url="file:///opt/dart-sdk-dev/lib/core" />
<root url="file:///opt/dart-sdk-dev/lib/developer" />
<root url="file:///opt/dart-sdk-dev/lib/ffi" />
<root url="file:///opt/dart-sdk-dev/lib/html" />
<root url="file:///opt/dart-sdk-dev/lib/indexed_db" />
<root url="file:///opt/dart-sdk-dev/lib/io" />
<root url="file:///opt/dart-sdk-dev/lib/isolate" />
<root url="file:///opt/dart-sdk-dev/lib/js" />
<root url="file:///opt/dart-sdk-dev/lib/js_util" />
<root url="file:///opt/dart-sdk-dev/lib/math" />
<root url="file:///opt/dart-sdk-dev/lib/mirrors" />
<root url="file:///opt/dart-sdk-dev/lib/svg" />
<root url="file:///opt/dart-sdk-dev/lib/typed_data" />
<root url="file:///opt/dart-sdk-dev/lib/web_audio" />
<root url="file:///opt/dart-sdk-dev/lib/web_gl" />
<root url="file:///opt/dart-sdk-dev/lib/web_sql" />
</CLASSES>
<JAVADOC />
<SOURCES />

1
analysis_options.yaml
View File

@ -64,7 +64,6 @@ linter:
- prefer_typing_uninitialized_variables
- recursive_getters
- slash_for_doc_comments
- super_goes_last
- test_types_in_equals
- throw_in_finally
- type_init_formals

4
sally/lib/src/runtime/executor/executor.dart
View File

@ -134,7 +134,7 @@ abstract class GeneratedDatabase {
/// value.
Future<List<QueryRow>> customSelect(String query,
{List<Variable> variables = const []}) async {
return CustomSelectStatement(query, variables, Set(), this).read();
return CustomSelectStatement(query, variables, <TableInfo>{}, this).read();
}
/// Creates a stream from a custom select statement.To use the variables, mark
@ -144,7 +144,7 @@ abstract class GeneratedDatabase {
/// reads data from.
Stream<List<QueryRow>> customSelectStream(String query,
{List<Variable> variables = const [], Set<TableInfo> readsFrom}) {
final tables = readsFrom ?? Set();
final tables = readsFrom ?? <TableInfo>{};
return createStream(CustomSelectStatement(query, variables, tables, this));
}
}

2
sally/pubspec.yaml
View File

@ -8,7 +8,7 @@ authors:
maintainer: Simon Binder (@simolus3)
environment:
sdk: '>=2.0.0 <3.0.0'
sdk: '>=2.1.2-dev.0.0 <3.0.0'
dependencies:
meta: '>= 1.0.0 <2.0.0'

63
sally/test/data/tables/todos.g.dart
View File

@ -14,6 +14,18 @@ class TodoEntry {
final int category;
TodoEntry(
{this.id, this.title, this.content, this.targetDate, this.category});
factory TodoEntry.fromData(Map<String, dynamic> data, GeneratedDatabase db) {
final intType = db.typeSystem.forDartType<int>();
final stringType = db.typeSystem.forDartType<String>();
final dateTimeType = db.typeSystem.forDartType<DateTime>();
return TodoEntry(
id: intType.mapFromDatabaseResponse(data['id']),
title: stringType.mapFromDatabaseResponse(data['title']),
content: stringType.mapFromDatabaseResponse(data['content']),
targetDate: dateTimeType.mapFromDatabaseResponse(data['target_date']),
category: intType.mapFromDatabaseResponse(data['category']),
);
}
@override
int get hashCode =>
((((id.hashCode) * 31 + title.hashCode) * 31 + content.hashCode) * 31 +
@ -73,19 +85,10 @@ class _$TodosTableTable extends TodosTable
targetDate.isAcceptableValue(instance.targetDate, isInserting) &&
category.isAcceptableValue(instance.category, isInserting);
@override
Set<GeneratedColumn> get $primaryKey => Set();
Set<GeneratedColumn> get $primaryKey => <GeneratedColumn>{};
@override
TodoEntry map(Map<String, dynamic> data) {
final intType = _db.typeSystem.forDartType<int>();
final stringType = _db.typeSystem.forDartType<String>();
final dateTimeType = _db.typeSystem.forDartType<DateTime>();
return TodoEntry(
id: intType.mapFromDatabaseResponse(data['id']),
title: stringType.mapFromDatabaseResponse(data['title']),
content: stringType.mapFromDatabaseResponse(data['content']),
targetDate: dateTimeType.mapFromDatabaseResponse(data['target_date']),
category: intType.mapFromDatabaseResponse(data['category']),
);
return TodoEntry.fromData(data, _db);
}
@override
@ -114,6 +117,14 @@ class Category {
final int id;
final String description;
Category({this.id, this.description});
factory Category.fromData(Map<String, dynamic> data, GeneratedDatabase db) {
final intType = db.typeSystem.forDartType<int>();
final stringType = db.typeSystem.forDartType<String>();
return Category(
id: intType.mapFromDatabaseResponse(data['id']),
description: stringType.mapFromDatabaseResponse(data['`desc`']),
);
}
@override
int get hashCode => (id.hashCode) * 31 + description.hashCode;
@override
@ -145,15 +156,10 @@ class _$CategoriesTable extends Categories
id.isAcceptableValue(instance.id, isInserting) &&
description.isAcceptableValue(instance.description, isInserting);
@override
Set<GeneratedColumn> get $primaryKey => Set();
Set<GeneratedColumn> get $primaryKey => <GeneratedColumn>{};
@override
Category map(Map<String, dynamic> data) {
final intType = _db.typeSystem.forDartType<int>();
final stringType = _db.typeSystem.forDartType<String>();
return Category(
id: intType.mapFromDatabaseResponse(data['id']),
description: stringType.mapFromDatabaseResponse(data['`desc`']),
);
return Category.fromData(data, _db);
}
@override
@ -174,6 +180,16 @@ class User {
final String name;
final bool isAwesome;
User({this.id, this.name, this.isAwesome});
factory User.fromData(Map<String, dynamic> data, GeneratedDatabase db) {
final intType = db.typeSystem.forDartType<int>();
final stringType = db.typeSystem.forDartType<String>();
final boolType = db.typeSystem.forDartType<bool>();
return User(
id: intType.mapFromDatabaseResponse(data['id']),
name: stringType.mapFromDatabaseResponse(data['name']),
isAwesome: boolType.mapFromDatabaseResponse(data['is_awesome']),
);
}
@override
int get hashCode =>
((id.hashCode) * 31 + name.hashCode) * 31 + isAwesome.hashCode;
@ -214,17 +230,10 @@ class _$UsersTable extends Users implements TableInfo<Users, User> {
name.isAcceptableValue(instance.name, isInserting) &&
isAwesome.isAcceptableValue(instance.isAwesome, isInserting);
@override
Set<GeneratedColumn> get $primaryKey => Set();
Set<GeneratedColumn> get $primaryKey => <GeneratedColumn>{};
@override
User map(Map<String, dynamic> data) {
final intType = _db.typeSystem.forDartType<int>();
final stringType = _db.typeSystem.forDartType<String>();
final boolType = _db.typeSystem.forDartType<bool>();
return User(
id: intType.mapFromDatabaseResponse(data['id']),
name: stringType.mapFromDatabaseResponse(data['name']),
isAwesome: boolType.mapFromDatabaseResponse(data['is_awesome']),
);
return User.fromData(data, _db);
}
@override

2
sally/test/update_test.dart
View File

@ -91,7 +91,7 @@ void main() {
});
test('informs about updated tables', () async {
await db.customUpdate('', updates: Set.of([db.users, db.todosTable]));
await db.customUpdate('', updates: {db.users, db.todosTable});
verify(streamQueries.handleTableUpdates('users'));
verify(streamQueries.handleTableUpdates('todos'));

2
sally_flutter/example/lib/database.dart
View File

@ -53,7 +53,7 @@ class Database extends _$Database {
// each category
return customSelectStream(
'SELECT *, (SELECT COUNT(*) FROM todos WHERE category = c.id) AS "amount" FROM categories c;',
readsFrom: Set.of([todos, categories])).map((rows) {
readsFrom: {todos, categories}).map((rows) {
// when we have the result set, map each row to the data class
return rows
.map((row) => CategoryWithCount(Category.fromData(row.data, this), row.readInt('amount')))

4
sally_flutter/example/lib/database.g.dart
View File

@ -84,7 +84,7 @@ class _$TodosTable extends Todos implements TableInfo<Todos, TodoEntry> {
targetDate.isAcceptableValue(instance.targetDate, isInserting) &&
category.isAcceptableValue(instance.category, isInserting);
@override
Set<GeneratedColumn> get $primaryKey => Set();
Set<GeneratedColumn> get $primaryKey => <GeneratedColumn>{};
@override
TodoEntry map(Map<String, dynamic> data) {
return TodoEntry.fromData(data, _db);
@ -155,7 +155,7 @@ class _$CategoriesTable extends Categories
id.isAcceptableValue(instance.id, isInserting) &&
description.isAcceptableValue(instance.description, isInserting);
@override
Set<GeneratedColumn> get $primaryKey => Set();
Set<GeneratedColumn> get $primaryKey => <GeneratedColumn>{};
@override
Category map(Map<String, dynamic> data) {
return Category.fromData(data, _db);

2
sally_generator/lib/src/model/specified_table.dart
View File

@ -12,7 +12,7 @@ class SpecifiedTable {
String get tableInfoName => '_\$${fromClass.name}Table';
// todo support primary keys
Set<SpecifiedColumn> get primaryKey => Set();
Set<SpecifiedColumn> get primaryKey => <SpecifiedColumn>{};
const SpecifiedTable(
{this.fromClass, this.columns, this.sqlName, this.dartTypeName});

4
sally_generator/lib/src/parser/column_parser.dart
View File

@ -10,9 +10,7 @@ const String startString = 'text';
const String startBool = 'boolean';
const String startDateTime = 'dateTime';
// todo replace with set literal once dart supports it
final Set<String> starters =
[startInt, startString, startBool, startDateTime].toSet();
final Set<String> starters = {startInt, startString, startBool, startDateTime};
const String functionNamed = 'named';
const String functionPrimaryKey = 'primaryKey';

18
sally_generator/lib/src/writer/table_writer.dart
View File

@ -45,14 +45,12 @@ class TableWriter {
_writeValidityCheckMethod(buffer);
// todo replace set syntax with literal once dart supports it
// write primary key getter: Set<Column> get $primaryKey => Set().add(id);
// write primary key getter: Set<Column> get $primaryKey => <GeneratedColumn>{id};
final primaryKeyColumns = table.primaryKey.map((c) => c.dartGetterName);
buffer.write('@override\nSet<GeneratedColumn> get \$primaryKey => Set()');
for (var pkColumn in primaryKeyColumns) {
buffer.write('..add($pkColumn)');
}
buffer.write('\n;');
buffer
..write('@override\nSet<GeneratedColumn> get \$primaryKey => <GeneratedColumn>{')
..write(primaryKeyColumns.join(', '))
..write('};\n');
_writeMappingMethod(buffer);
_writeReverseMappingMethod(buffer);
@ -65,9 +63,9 @@ class TableWriter {
final dataClassName = table.dartTypeName;
buffer
..write('@override\n$dataClassName map(Map<String, dynamic> data) {\n')
..write('return $dataClassName.fromData(data, _db);\n')
..write('}\n');
..write('@override\n$dataClassName map(Map<String, dynamic> data) {\n')
..write('return $dataClassName.fromData(data, _db);\n')
..write('}\n');
}
void _writeReverseMappingMethod(StringBuffer buffer) {

2
sally_generator/pubspec.yaml
View File

@ -8,7 +8,7 @@ authors:
maintainer: Simon Binder (@simolus3)
environment:
sdk: '>=2.0.0 <3.0.0'
sdk: '>=2.1.2-dev.0.0 <3.0.0'
dependencies:
analyzer: '>=0.34.0 <0.36.0'