From 4466926d31591416d6aaa97682ab2a016469b509 Mon Sep 17 00:00:00 2001 From: thomashii Date: Thu, 24 Feb 2022 08:34:51 +0800 Subject: [PATCH] Updated ORM --- packages/orm/angel_migration/pubspec.yaml | 2 +- .../orm/angel_migration_runner/pubspec.yaml | 8 ++-- packages/orm/angel_orm/pubspec.yaml | 19 +++++--- packages/orm/angel_orm_generator/pubspec.yaml | 34 +++++++++---- packages/orm/angel_orm_mysql/CHANGELOG.md | 8 +++- packages/orm/angel_orm_mysql/pubspec.yaml | 15 ++++-- packages/orm/angel_orm_postgres/pubspec.yaml | 12 +++-- .../orm/angel_orm_service/example/main.dart | 2 +- packages/orm/angel_orm_service/pubspec.yaml | 48 +++++++++++++++---- packages/orm/angel_orm_test/pubspec.yaml | 42 ++++++++++------ 10 files changed, 135 insertions(+), 55 deletions(-) diff --git a/packages/orm/angel_migration/pubspec.yaml b/packages/orm/angel_migration/pubspec.yaml index 60b17d1e..ba7682e2 100755 --- a/packages/orm/angel_migration/pubspec.yaml +++ b/packages/orm/angel_migration/pubspec.yaml @@ -11,4 +11,4 @@ dev_dependencies: lints: ^1.0.0 dependency_overrides: angel3_orm: - path: ../angel_orm \ No newline at end of file + path: ../angel_orm diff --git a/packages/orm/angel_migration_runner/pubspec.yaml b/packages/orm/angel_migration_runner/pubspec.yaml index 3a24cbee..00757bc1 100755 --- a/packages/orm/angel_migration_runner/pubspec.yaml +++ b/packages/orm/angel_migration_runner/pubspec.yaml @@ -1,13 +1,13 @@ name: angel3_migration_runner -version: 4.1.2 +version: 6.0.0 description: Command-line based database migration runner for Angel3's ORM. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_migration_runner environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.15.0 <3.0.0' dependencies: - angel3_migration: ^4.1.0 - angel3_orm: ^4.1.0 + angel3_migration: ^6.0.0 + angel3_orm: ^6.0.0 args: ^2.1.0 charcode: ^1.2.0 postgres: ^2.4.0 diff --git a/packages/orm/angel_orm/pubspec.yaml b/packages/orm/angel_orm/pubspec.yaml index 860f8b12..dfd4c626 100644 --- a/packages/orm/angel_orm/pubspec.yaml +++ b/packages/orm/angel_orm/pubspec.yaml @@ -1,10 +1,10 @@ name: angel3_orm -version: 4.1.0 +version: 6.0.0 description: Runtime support for Angel3 ORM. Includes base classes for queries. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.15.0 <3.0.0' dependencies: charcode: ^1.2.0 intl: ^0.17.0 @@ -13,9 +13,16 @@ dependencies: optional: ^6.0.0 logging: ^1.0.0 dev_dependencies: - angel3_model: ^3.0.0 - angel3_serialize: ^4.1.0 - angel3_serialize_generator: ^4.1.0 + angel3_model: ^6.0.0 + angel3_serialize: ^6.0.0 + angel3_serialize_generator: ^6.0.0 build_runner: ^2.1.1 test: ^1.17.4 - lints: ^1.0.0 \ No newline at end of file + lints: ^1.0.0 +dependency_overrides: + angel3_serialize: + path: ../../serialize/angel_serialize + angel3_serialize_generator: + path: ../../serialize/angel_serialize_generator + angel3_model: + path: ../../model \ No newline at end of file diff --git a/packages/orm/angel_orm_generator/pubspec.yaml b/packages/orm/angel_orm_generator/pubspec.yaml index 84914431..ee8f73a3 100644 --- a/packages/orm/angel_orm_generator/pubspec.yaml +++ b/packages/orm/angel_orm_generator/pubspec.yaml @@ -1,16 +1,16 @@ name: angel3_orm_generator -version: 5.0.0 +version: 6.0.0 description: Code generators for Angel3 ORM. Generates query builder classes. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_generator environment: - sdk: '>=2.14.0 <3.0.0' + sdk: '>=2.15.0 <3.0.0' dependencies: + angel3_model: ^6.0.0 + angel3_serialize: ^6.0.0 + angel3_orm: ^6.0.0 + angel3_serialize_generator: ^6.0.0 analyzer: ^3.0.0 - angel3_model: ^3.0.0 - angel3_serialize: ^4.0.0 - angel3_orm: ^4.1.0 - angel3_serialize_generator: ^5.0.0 inflection3: ^0.5.3+1 build: ^2.0.1 build_config: ^1.0.0 @@ -24,17 +24,31 @@ dependencies: logging: ^1.0.0 optional: ^6.0.0 dev_dependencies: - angel3_framework: ^4.2.0 - angel3_migration: ^4.1.0 + angel3_framework: ^6.0.0 + angel3_migration: ^6.0.0 build_runner: ^2.0.1 postgres: ^2.4.0 test: ^1.17.3 lints: ^1.0.0 dependency_overrides: + angel3_container: + path: ../../container/angel_container + angel3_framework: + path: ../../framework + angel3_http_exception: + path: ../../http_exception + angel3_model: + path: ../../model + angel3_route: + path: ../../route + angel3_mock_request: + path: ../../mock_request + angel3_serialize: + path: ../../serialize/angel_serialize + angel3_serialize_generator: + path: ../../serialize/angel_serialize_generator angel3_orm: path: ../angel_orm angel3_migration: path: ../angel_migration - angel3_serialize_generator: - path: ../../serialize/angel_serialize_generator \ No newline at end of file diff --git a/packages/orm/angel_orm_mysql/CHANGELOG.md b/packages/orm/angel_orm_mysql/CHANGELOG.md index 13305a1a..9402e700 100644 --- a/packages/orm/angel_orm_mysql/CHANGELOG.md +++ b/packages/orm/angel_orm_mysql/CHANGELOG.md @@ -1,8 +1,10 @@ # Change Log -## 6.0.0 +## 6.0.0-beta.1 * Updated to min SDK 2.15.x +* Upgrade to use `mysql1` driver +* Added support for MariaDB 10.2.x ## 5.0.0 @@ -16,6 +18,10 @@ * No release. Skipped +## 2.0.0 + +* No release. Skipped + ## 2.0.0-beta.3 * Updated linter to `package:lints` diff --git a/packages/orm/angel_orm_mysql/pubspec.yaml b/packages/orm/angel_orm_mysql/pubspec.yaml index 49abe095..28a6a889 100644 --- a/packages/orm/angel_orm_mysql/pubspec.yaml +++ b/packages/orm/angel_orm_mysql/pubspec.yaml @@ -1,22 +1,29 @@ name: angel3_orm_mysql -version: 2.0.0-beta.3 +version: 6.0.0-beta.1 description: MySQL support for Angel3 ORM. Includes functionality for querying and transactions. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_mysql environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.15.0 <3.0.0' dependencies: - angel3_orm: ^4.1.0 + angel3_orm: ^6.0.0 logging: ^1.0.0 mysql1: ^0.19.0 optional: ^6.0.0 dev_dependencies: - angel3_orm_test: ^3.0.0 + angel3_orm_test: ^6.0.0 test: ^1.17.0 lints: ^1.0.0 dependency_overrides: + angel3_serialize: + path: ../../serialize/angel_serialize + angel3_model: + path: ../../model angel3_orm_test: path: ../angel_orm_test angel3_orm: path: ../angel_orm + angel3_migration: + path: ../angel_migration + diff --git a/packages/orm/angel_orm_postgres/pubspec.yaml b/packages/orm/angel_orm_postgres/pubspec.yaml index 8a17103b..2489f8cc 100644 --- a/packages/orm/angel_orm_postgres/pubspec.yaml +++ b/packages/orm/angel_orm_postgres/pubspec.yaml @@ -1,22 +1,26 @@ name: angel3_orm_postgres -version: 3.3.0 +version: 6.0.0 description: PostgreSQL support for Angel3 ORM. Includes functionality for querying and transactions. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_postgres environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.15.0 <3.0.0' dependencies: - angel3_orm: ^4.1.0 + angel3_orm: ^6.0.0 logging: ^1.0.1 pool: ^1.5.0 postgres: ^2.4.1 postgres_pool: ^2.1.3 dev_dependencies: belatuk_pretty_logging: ^4.0.0 - angel3_orm_test: ^3.1.0 + angel3_orm_test: ^6.0.0 test: ^1.17.5 lints: ^1.0.0 dependency_overrides: + angel3_serialize: + path: ../../serialize/angel_serialize + angel3_model: + path: ../../model angel3_orm_test: path: ../angel_orm_test angel3_orm: diff --git a/packages/orm/angel_orm_service/example/main.dart b/packages/orm/angel_orm_service/example/main.dart index 1def5eed..548007b0 100644 --- a/packages/orm/angel_orm_service/example/main.dart +++ b/packages/orm/angel_orm_service/example/main.dart @@ -11,7 +11,7 @@ void main() async { var app = Angel(logger: Logger.detached('orm_service')); var http = AngelHttp(app); var executor = await connect(); - app.logger!.onRecord.listen((rec) { + app.logger.onRecord.listen((rec) { print(rec); if (rec.error != null) print(rec.error); if (rec.stackTrace != null) print(rec.stackTrace); diff --git a/packages/orm/angel_orm_service/pubspec.yaml b/packages/orm/angel_orm_service/pubspec.yaml index 7d230317..146be94e 100644 --- a/packages/orm/angel_orm_service/pubspec.yaml +++ b/packages/orm/angel_orm_service/pubspec.yaml @@ -1,24 +1,52 @@ name: angel3_orm_service -version: 2.0.1 +version: 6.0.0 description: Service implementation that wraps over Angel3 ORM Query classes. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/orm/angel_orm_service environment: - sdk: '>=2.12.0 <3.0.0' + sdk: '>=2.15.0 <3.0.0' dependencies: - angel3_framework: ^4.2.0 - angel3_orm: ^4.0.0 + angel3_framework: ^6.0.0 + angel3_orm: ^6.0.0 postgres: ^2.4.0 optional: ^6.0.0 dev_dependencies: - angel3_migration: ^4.0.0 - angel3_migration_runner: ^4.0.0 - angel3_orm_generator: ^4.0.0 - angel3_orm_postgres: ^3.0.0 - angel3_serialize: ^4.0.0 + angel3_migration: ^6.0.0 + angel3_migration_runner: ^6.0.0 + angel3_orm_generator: ^6.0.0 + angel3_orm_postgres: ^6.0.0 + angel3_serialize: ^6.0.0 #angel3_orm_test: ^3.0.0 build_runner: ^2.0.4 logging: ^1.0.1 test: ^1.17.7 lints: ^1.0.0 - +dependency_overrides: + angel3_container: + path: ../../container/angel_container + angel3_framework: + path: ../../framework + angel3_http_exception: + path: ../../http_exception + angel3_model: + path: ../../model + angel3_route: + path: ../../route + angel3_mock_request: + path: ../../mock_request + angel3_serialize: + path: ../../serialize/angel_serialize + angel3_serialize_generator: + path: ../../serialize/angel_serialize_generator + angel3_orm_test: + path: ../angel_orm_test + angel3_orm: + path: ../angel_orm + angel3_orm_generator: + path: ../angel_orm_generator + angel3_orm_postgres: + path: ../angel_orm_postgres + angel3_migration: + path: ../angel_migration + angel3_migration_runner: + path: ../angel_migration_runner diff --git a/packages/orm/angel_orm_test/pubspec.yaml b/packages/orm/angel_orm_test/pubspec.yaml index 215180de..a2dadc70 100644 --- a/packages/orm/angel_orm_test/pubspec.yaml +++ b/packages/orm/angel_orm_test/pubspec.yaml @@ -1,30 +1,44 @@ name: angel3_orm_test -version: 4.0.0 +version: 6.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' + sdk: '>=2.15.0 <3.0.0' dependencies: - angel3_migration: ^4.1.0 - angel3_model: ^3.1.0 - angel3_orm: ^4.0.0 - angel3_serialize: ^4.1.0 + angel3_migration: ^6.0.0 + angel3_model: ^6.0.0 + angel3_orm: ^6.0.0 + angel3_serialize: ^6.0.0 io: ^1.0.0 test: ^1.17.4 collection: ^1.15.0 optional: ^6.0.0 dev_dependencies: - angel3_orm_generator: ^5.0.0 - angel3_framework: ^4.2.0 + angel3_orm_generator: ^6.0.0 + angel3_framework: ^6.0.0 build_runner: ^2.0.1 lints: ^1.0.0 dependency_overrides: - angel3_orm: - path: ../angel_orm - angel3_orm_generator: - path: ../angel_orm_generator - angel3_migration: - path: ../angel_migration + angel3_container: + path: ../../container/angel_container + angel3_framework: + path: ../../framework + angel3_http_exception: + path: ../../http_exception + angel3_model: + path: ../../model + angel3_route: + path: ../../route + angel3_mock_request: + path: ../../mock_request + angel3_serialize: + path: ../../serialize/angel_serialize angel3_serialize_generator: path: ../../serialize/angel_serialize_generator + angel3_orm: + path: ../angel_orm + angel3_migration: + path: ../angel_migration + angel3_orm_generator: + path: ../angel_orm_generator