From 700a21d29e2b605a9edf7aa9f05faee89376ef60 Mon Sep 17 00:00:00 2001 From: Simon Binder Date: Thu, 14 Feb 2019 17:55:31 +0100 Subject: [PATCH] Format, improve travis testing --- .idea/libraries/Dart_Packages.xml | 14 ++++++-------- .travis.yml | 2 +- sally/lib/src/runtime/executor/stream_queries.dart | 3 ++- sally/lib/src/runtime/statements/delete.dart | 3 ++- sally/lib/src/runtime/statements/insert.dart | 3 ++- sally/lib/src/runtime/statements/update.dart | 6 ++++-- sally/lib/src/runtime/structure/columns.dart | 8 ++------ sally/lib/src/runtime/structure/table_info.dart | 2 +- sally/mono_pkg.yaml | 4 ++-- sally/pubspec.yaml | 1 + sally/test/delete_test.dart | 6 +++--- sally/test/select_test.dart | 7 +------ sally/test/streams_test.dart | 2 +- sally/test/tables/todos.dart | 7 +------ sally/test/utils/mocks.dart | 4 +--- .../lib/src/model/specified_column.dart | 3 +++ sally_generator/lib/src/parser/table_parser.dart | 1 + sally_generator/lib/src/sqlite_keywords.dart | 5 ++--- sally_generator/lib/src/writer/table_writer.dart | 7 ++++--- sally_generator/mono_pkg.yaml | 2 +- tool/mono_repo_wrapper.sh | 10 ++++++++++ tool/travis.sh | 9 +++++++-- 22 files changed, 58 insertions(+), 51 deletions(-) create mode 100755 tool/mono_repo_wrapper.sh diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index 1cda38af..8d06f79e 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -6,7 +6,7 @@ @@ -191,7 +191,7 @@ @@ -269,7 +269,7 @@ @@ -486,7 +486,6 @@ - @@ -597,7 +596,7 @@ - + @@ -625,7 +624,7 @@ - + @@ -637,7 +636,7 @@ - + @@ -666,7 +665,6 @@ - diff --git a/.travis.yml b/.travis.yml index 265164c2..99c2b55a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: - PKG="sally" - PKG="sally_generator" -script: ./tool/travis.sh dartfmt dartanalyzer test +script: ./tool/mono_repo_wrapper.sh # Only building master means that we don't run two builds for each pull request. branches: diff --git a/sally/lib/src/runtime/executor/stream_queries.dart b/sally/lib/src/runtime/executor/stream_queries.dart index 746a1bfe..eab16cde 100644 --- a/sally/lib/src/runtime/executor/stream_queries.dart +++ b/sally/lib/src/runtime/executor/stream_queries.dart @@ -14,7 +14,8 @@ class StreamQueryStore { } Future handleTableUpdates(String table) async { - final affectedStreams = _activeStreams.where((stream) => stream.isAffectedByTableChange(table)); + final affectedStreams = + _activeStreams.where((stream) => stream.isAffectedByTableChange(table)); for (var stream in affectedStreams) { await stream.fetchAndEmitData(); diff --git a/sally/lib/src/runtime/statements/delete.dart b/sally/lib/src/runtime/statements/delete.dart index a554f74e..b23359c6 100644 --- a/sally/lib/src/runtime/statements/delete.dart +++ b/sally/lib/src/runtime/statements/delete.dart @@ -16,7 +16,8 @@ class DeleteStatement extends Query { Future go() async { final ctx = constructQuery(); - final rows = await ctx.database.executor.runDelete(ctx.sql, ctx.boundVariables); + final rows = + await ctx.database.executor.runDelete(ctx.sql, ctx.boundVariables); if (rows > 0) { database.markTableUpdated(table.$tableName); diff --git a/sally/lib/src/runtime/statements/insert.dart b/sally/lib/src/runtime/statements/insert.dart index 66ad9fee..496aae64 100644 --- a/sally/lib/src/runtime/statements/insert.dart +++ b/sally/lib/src/runtime/statements/insert.dart @@ -12,7 +12,8 @@ class InsertStatement { Future insert(DataClass entity) async { if (!table.validateIntegrity(entity, true)) { - throw InvalidDataException('Invalid data: $entity cannot be written into ${table.$tableName}'); + throw InvalidDataException( + 'Invalid data: $entity cannot be written into ${table.$tableName}'); } final map = table.entityToSql(entity) diff --git a/sally/lib/src/runtime/statements/update.dart b/sally/lib/src/runtime/statements/update.dart index 9aebb012..cb4a6c23 100644 --- a/sally/lib/src/runtime/statements/update.dart +++ b/sally/lib/src/runtime/statements/update.dart @@ -39,11 +39,13 @@ class UpdateStatement extends Query { Future write(D entity) async { _updateReference = entity; if (!table.validateIntegrity(_updateReference, false)) { - throw InvalidDataException('Invalid data: $entity cannot be written into ${table.$tableName}'); + throw InvalidDataException( + 'Invalid data: $entity cannot be written into ${table.$tableName}'); } final ctx = constructQuery(); - final rows = await ctx.database.executor.runUpdate(ctx.sql, ctx.boundVariables); + final rows = + await ctx.database.executor.runUpdate(ctx.sql, ctx.boundVariables); if (rows > 0) { database.markTableUpdated(table.$tableName); diff --git a/sally/lib/src/runtime/structure/columns.dart b/sally/lib/src/runtime/structure/columns.dart index e57640e9..30557b27 100644 --- a/sally/lib/src/runtime/structure/columns.dart +++ b/sally/lib/src/runtime/structure/columns.dart @@ -75,15 +75,11 @@ class GeneratedTextColumn extends GeneratedColumn if (value == null) return nullOk; final length = value.length; - if (minTextLength != null && minTextLength > length) - return false; - if (maxTextLength != null && maxTextLength < length) - return false; + if (minTextLength != null && minTextLength > length) return false; + if (maxTextLength != null && maxTextLength < length) return false; return true; } - - } class GeneratedBoolColumn extends GeneratedColumn diff --git a/sally/lib/src/runtime/structure/table_info.dart b/sally/lib/src/runtime/structure/table_info.dart index 22601f17..4730ecad 100644 --- a/sally/lib/src/runtime/structure/table_info.dart +++ b/sally/lib/src/runtime/structure/table_info.dart @@ -17,7 +17,7 @@ abstract class TableInfo { /// that it respects all constraints (nullability, text length, etc.). /// During insertion mode, fields that have a default value or are /// auto-incrementing are allowed to be null as they will be set by sqlite. - bool validateIntegrity(DataClass instance, bool isInserting) => null; + bool validateIntegrity(DataClass instance, bool isInserting); /// Maps the given data class into a map that can be inserted into sql. The /// keys should represent the column name in sql, the values the corresponding diff --git a/sally/mono_pkg.yaml b/sally/mono_pkg.yaml index eaf08705..bffc6f53 100644 --- a/sally/mono_pkg.yaml +++ b/sally/mono_pkg.yaml @@ -3,7 +3,7 @@ dart: stages: - analyze: - - dartanalyzer + - dartanalyzer: --fatal-infos --fatal-warnings . - dartfmt - unit_test: - - test \ No newline at end of file + - command: pub run build_runner test \ No newline at end of file diff --git a/sally/pubspec.yaml b/sally/pubspec.yaml index 63f61e53..bcf4a4d8 100644 --- a/sally/pubspec.yaml +++ b/sally/pubspec.yaml @@ -14,5 +14,6 @@ dev_dependencies: sally_generator: path: ../sally_generator build_runner: ^1.2.6 + build_test: ^0.10.6 test: ^1.5.3 mockito: ^4.0.0 diff --git a/sally/test/delete_test.dart b/sally/test/delete_test.dart index 19325e36..b3f10765 100644 --- a/sally/test/delete_test.dart +++ b/sally/test/delete_test.dart @@ -24,8 +24,8 @@ void main() { test('for complex components', () async { await (db.delete(db.users) - ..where((u) => or(not(u.isAwesome), u.id.isSmallerThan(100))) - ..limit(10, offset: 100)) + ..where((u) => or(not(u.isAwesome), u.id.isSmallerThan(100))) + ..limit(10, offset: 100)) .go(); verify(executor.runDelete( @@ -51,4 +51,4 @@ void main() { verifyNever(streamQueries.handleTableUpdates(any)); }); }); -} \ No newline at end of file +} diff --git a/sally/test/select_test.dart b/sally/test/select_test.dart index 0457457e..47d320f8 100644 --- a/sally/test/select_test.dart +++ b/sally/test/select_test.dart @@ -53,12 +53,7 @@ void main() { group('SELECT results are parsed', () { test('when all fields are non-null', () { final data = [ - { - 'id': 10, - 'title': 'A todo title', - 'content': 'Content', - 'category': 3 - } + {'id': 10, 'title': 'A todo title', 'content': 'Content', 'category': 3} ]; final resolved = TodoEntry( id: 10, diff --git a/sally/test/streams_test.dart b/sally/test/streams_test.dart index 13babf0d..6089692f 100644 --- a/sally/test/streams_test.dart +++ b/sally/test/streams_test.dart @@ -49,4 +49,4 @@ void main() { verifyNever(executor.runSelect(any, any)); }); }); -} \ No newline at end of file +} diff --git a/sally/test/tables/todos.dart b/sally/test/tables/todos.dart index 71301c49..f6b18169 100644 --- a/sally/test/tables/todos.dart +++ b/sally/test/tables/todos.dart @@ -4,7 +4,6 @@ part 'todos.g.dart'; @DataClassName('TodoEntry') class TodosTable extends Table { - @override String get tableName => 'todos'; @@ -13,7 +12,6 @@ class TodosTable extends Table { TextColumn get content => text()(); IntColumn get category => integer().nullable()(); - } class Users extends Table { @@ -24,10 +22,8 @@ class Users extends Table { @DataClassName('Category') class Categories extends Table { - IntColumn get id => integer().autoIncrement()(); TextColumn get description => text().named('desc')(); - } @UseSally(tables: [TodosTable, Categories, Users]) @@ -39,5 +35,4 @@ class TodoDb extends _$TodoDb { @override int get schemaVersion => 1; - -} \ No newline at end of file +} diff --git a/sally/test/utils/mocks.dart b/sally/test/utils/mocks.dart index 2c2b9acf..5fa51d73 100644 --- a/sally/test/utils/mocks.dart +++ b/sally/test/utils/mocks.dart @@ -5,14 +5,12 @@ import 'package:sally/src/runtime/executor/stream_queries.dart'; export 'package:mockito/mockito.dart'; class MockExecutor extends Mock implements QueryExecutor { - MockExecutor() { when(runSelect(any, any)).thenAnswer((_) => Future.value([])); when(runUpdate(any, any)).thenAnswer((_) => Future.value(0)); when(runDelete(any, any)).thenAnswer((_) => Future.value(0)); when(runInsert(any, any)).thenAnswer((_) => Future.value(0)); } - } class MockStreamQueries extends Mock implements StreamQueryStore {} @@ -22,4 +20,4 @@ abstract class SqlExecutorAsClass { Future call(String sql); } -class MockQueryExecutor extends Mock implements SqlExecutorAsClass {} \ No newline at end of file +class MockQueryExecutor extends Mock implements SqlExecutorAsClass {} diff --git a/sally_generator/lib/src/model/specified_column.dart b/sally_generator/lib/src/model/specified_column.dart index 24129069..31640c3e 100644 --- a/sally_generator/lib/src/model/specified_column.dart +++ b/sally_generator/lib/src/model/specified_column.dart @@ -43,10 +43,13 @@ class SpecifiedColumn { /// as getter name in the TableInfo class (as it needs to override the field) /// and in the generated data class that will be generated for each table. final String dartGetterName; + /// The sql type of this column final ColumnType type; + /// The name of this column, as chosen by the user final ColumnName name; + /// Whether the user has explicitly declared this column to be nullable, the /// default is false final bool nullable; diff --git a/sally_generator/lib/src/parser/table_parser.dart b/sally_generator/lib/src/parser/table_parser.dart index de2d0e79..ca973963 100644 --- a/sally_generator/lib/src/parser/table_parser.dart +++ b/sally_generator/lib/src/parser/table_parser.dart @@ -15,6 +15,7 @@ class TableParser extends ParserBase { SpecifiedTable parse(ClassElement element) { final sqlName = _parseTableName(element); + if (sqlName == null) return null; return SpecifiedTable( fromClass: element, diff --git a/sally_generator/lib/src/sqlite_keywords.dart b/sally_generator/lib/src/sqlite_keywords.dart index 0015dde8..7c0a501b 100644 --- a/sally_generator/lib/src/sqlite_keywords.dart +++ b/sally_generator/lib/src/sqlite_keywords.dart @@ -141,7 +141,6 @@ const sqliteKeywords = [ bool isSqliteKeyword(String s) => sqliteKeywords.contains(s.toUpperCase()); String escapeIfNeeded(String s) { - if (isSqliteKeyword(s)) - return '`$s`'; + if (isSqliteKeyword(s)) return '`$s`'; return s; -} \ No newline at end of file +} diff --git a/sally_generator/lib/src/writer/table_writer.dart b/sally_generator/lib/src/writer/table_writer.dart index 991e4e49..b2019356 100644 --- a/sally_generator/lib/src/writer/table_writer.dart +++ b/sally_generator/lib/src/writer/table_writer.dart @@ -76,8 +76,8 @@ class TableWriter { final resolver = '${ReCase(usedType).camelCase}Type'; dartTypeToResolver[usedType] = resolver; - buffer - .write('final $resolver = _db.typeSystem.forDartType<$usedType>();\n'); + buffer.write( + 'final $resolver = _db.typeSystem.forDartType<$usedType>();\n'); } // finally, the mighty constructor invocation: @@ -146,7 +146,8 @@ class TableWriter { void _writeValidityCheckMethod(StringBuffer buffer) { final dataClass = table.dartTypeName; - buffer.write('@override\nbool validateIntegrity($dataClass instance, bool isInserting) => '); + buffer.write( + '@override\nbool validateIntegrity($dataClass instance, bool isInserting) => '); final validationCode = table.columns.map((column) { final getterName = column.dartGetterName; diff --git a/sally_generator/mono_pkg.yaml b/sally_generator/mono_pkg.yaml index 40d8fde3..83aa2155 100644 --- a/sally_generator/mono_pkg.yaml +++ b/sally_generator/mono_pkg.yaml @@ -3,7 +3,7 @@ dart: stages: - analyze: - - dartanalyzer + - dartanalyzer: --fatal-infos --fatal-warnings . - dartfmt - unit_test: - test diff --git a/tool/mono_repo_wrapper.sh b/tool/mono_repo_wrapper.sh new file mode 100755 index 00000000..666f4410 --- /dev/null +++ b/tool/mono_repo_wrapper.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +case $PKG in +sally_generator) + ./tool/travis.sh dartfmt dartanalyzer test +;; +sally) + ./tool/travis.sh dartfmt dartanalyzer command +;; +esac \ No newline at end of file diff --git a/tool/travis.sh b/tool/travis.sh index 14e1de2b..753eddc5 100755 --- a/tool/travis.sh +++ b/tool/travis.sh @@ -19,10 +19,15 @@ EXIT_CODE=0 while (( "$#" )); do TASK=$1 case $TASK in + command) echo + echo -e '\033[1mTASK: command\033[22m' + echo -e 'pub run build_runner test' + pub run build_runner test || EXIT_CODE=$? + ;; dartanalyzer) echo echo -e '\033[1mTASK: dartanalyzer\033[22m' - echo -e 'dartanalyzer .' - dartanalyzer . || EXIT_CODE=$? + echo -e 'dartanalyzer --fatal-infos --fatal-warnings .' + dartanalyzer --fatal-infos --fatal-warnings . || EXIT_CODE=$? ;; dartfmt) echo echo -e '\033[1mTASK: dartfmt\033[22m'