From 02350397196c949236f4923c6b473fa4bb24a696 Mon Sep 17 00:00:00 2001 From: thomashii Date: Sun, 13 Feb 2022 21:01:10 +0800 Subject: [PATCH] Updated pubspec --- packages/orm/angel_orm_mysql/pubspec.yaml | 2 +- packages/orm/angel_orm_postgres/pubspec.yaml | 4 +++- packages/orm/angel_orm_test/lib/src/models/car.g.dart | 5 +++-- .../orm/angel_orm_test/lib/src/models/person_order.g.dart | 4 ++-- packages/orm/angel_orm_test/pubspec.yaml | 8 +++++--- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/orm/angel_orm_mysql/pubspec.yaml b/packages/orm/angel_orm_mysql/pubspec.yaml index bc30de7c..49abe095 100644 --- a/packages/orm/angel_orm_mysql/pubspec.yaml +++ b/packages/orm/angel_orm_mysql/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel environment: sdk: '>=2.12.0 <3.0.0' dependencies: - angel3_orm: ^4.0.0 + angel3_orm: ^4.1.0 logging: ^1.0.0 mysql1: ^0.19.0 optional: ^6.0.0 diff --git a/packages/orm/angel_orm_postgres/pubspec.yaml b/packages/orm/angel_orm_postgres/pubspec.yaml index f682fc88..8a17103b 100644 --- a/packages/orm/angel_orm_postgres/pubspec.yaml +++ b/packages/orm/angel_orm_postgres/pubspec.yaml @@ -6,7 +6,7 @@ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel environment: sdk: '>=2.12.0 <3.0.0' dependencies: - angel3_orm: ^4.0.0 + angel3_orm: ^4.1.0 logging: ^1.0.1 pool: ^1.5.0 postgres: ^2.4.1 @@ -21,3 +21,5 @@ dependency_overrides: path: ../angel_orm_test angel3_orm: path: ../angel_orm + angel3_migration: + path: ../angel_migration diff --git a/packages/orm/angel_orm_test/lib/src/models/car.g.dart b/packages/orm/angel_orm_test/lib/src/models/car.g.dart index 2287dd49..e7329ddc 100644 --- a/packages/orm/angel_orm_test/lib/src/models/car.g.dart +++ b/packages/orm/angel_orm_test/lib/src/models/car.g.dart @@ -94,9 +94,10 @@ class CarQuery extends Query { createdAt: fields.contains('created_at') ? (row[1] as DateTime?) : null, updatedAt: fields.contains('updated_at') ? (row[2] as DateTime?) : null, make: fields.contains('make') ? (row[3] as String?) : null, - description: fields.contains('description') ? mapToText(row[4]) : null, + description: + fields.contains('description') ? (row[4] as String?) : null, familyFriendly: - fields.contains('family_friendly') ? mapToBool(row[5]) : null, + fields.contains('family_friendly') ? (row[5] as bool?) : null, recalledAt: fields.contains('recalled_at') ? (row[6] as DateTime?) : null); return Optional.of(model); diff --git a/packages/orm/angel_orm_test/lib/src/models/person_order.g.dart b/packages/orm/angel_orm_test/lib/src/models/person_order.g.dart index cac1ac5f..8dddf199 100644 --- a/packages/orm/angel_orm_test/lib/src/models/person_order.g.dart +++ b/packages/orm/angel_orm_test/lib/src/models/person_order.g.dart @@ -48,7 +48,7 @@ class PersonOrderQuery extends Query { @override Map get casts { - return {'price': 'text'}; + return {'price': 'char'}; } @override @@ -212,7 +212,7 @@ class OrderWithPersonInfoQuery @override Map get casts { - return {'price': 'text'}; + return {'price': 'char'}; } @override diff --git a/packages/orm/angel_orm_test/pubspec.yaml b/packages/orm/angel_orm_test/pubspec.yaml index 976812d6..215180de 100644 --- a/packages/orm/angel_orm_test/pubspec.yaml +++ b/packages/orm/angel_orm_test/pubspec.yaml @@ -1,12 +1,12 @@ name: angel3_orm_test -version: 3.1.2 +version: 4.0.0 description: Common tests for Angel3 ORM. Reference implmentation of the generated ORM files. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_test environment: sdk: '>=2.12.0 <3.0.0' dependencies: - angel3_migration: ^4.0.0 + angel3_migration: ^4.1.0 angel3_model: ^3.1.0 angel3_orm: ^4.0.0 angel3_serialize: ^4.1.0 @@ -15,7 +15,7 @@ dependencies: collection: ^1.15.0 optional: ^6.0.0 dev_dependencies: - angel3_orm_generator: ^4.1.0 + angel3_orm_generator: ^5.0.0 angel3_framework: ^4.2.0 build_runner: ^2.0.1 lints: ^1.0.0 @@ -26,3 +26,5 @@ dependency_overrides: path: ../angel_orm_generator angel3_migration: path: ../angel_migration + angel3_serialize_generator: + path: ../../serialize/angel_serialize_generator