use new orm features

codekeyz · Apr 22, 2024 · 249e720 · 249e720
1 parent 0a4b5b5
commit 249e720
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 57 deletions.
diff --git a/bin/backend.dart b/bin/backend.dart
@@ -1,13 +1,12 @@
-import 'package:yaroorm/yaroorm.dart';
 import 'package:backend/backend.dart';
 
-import '../database/config.dart' as orm;
 import 'backend.reflectable.dart';
 
+import '../database/database.dart' as db;
+
 void main(List<String> arguments) async {
   initializeReflectable();
-
-  DB.init(orm.config);
+  db.initializeORM();
 
   await blogApp.bootstrap();
 }
diff --git a/bin/tools/migrator.dart b/bin/tools/migrator.dart
diff --git a/database/config.dart b/database/config.dart
@@ -1,13 +1,13 @@
-import 'package:backend/src/utils/utils.dart';
 import 'package:path/path.dart' as path;
 import 'package:pharaoh/next/core.dart';
 import 'package:yaroorm/yaroorm.dart';
 
-import './migrations/create_articles_table.dart';
-import './migrations/create_users_table.dart';
-
+@DB.useConfig
 final config = YaroormConfig(
-  isDebugMode ? 'test_db' : 'mysql',
+  // isDebugMode ?
+  'test_db'
+  //  : 'mysql'
+  ,
   connections: [
     DatabaseConnection('test_db', DatabaseDriverType.sqlite, database: path.absolute('database', 'db.sqlite')),
     DatabaseConnection(
@@ -21,5 +21,4 @@ final config = YaroormConfig(
       secure: true,
     ),
   ],
-  migrations: [CreateUsersTable(), CreateArticlesTable()],
 );
diff --git a/database/database.dart b/database/database.dart
diff --git a/database/migrations/create_users_table.dart → ...2024_04_20_003612_create_users_table.dart b/database/migrations/create_users_table.dart → ...2024_04_20_003612_create_users_table.dart
@@ -3,12 +3,12 @@ import 'package:yaroorm/yaroorm.dart';
 
 class CreateUsersTable extends Migration {
   @override
-  void up(List schemas) {
+  void up(List<Schema> schemas) {
     schemas.add(UserSchema);
   }
 
   @override
-  void down(List schemas) {
+  void down(List<Schema> schemas) {
     schemas.add(Schema.dropIfExists(UserSchema));
   }
 }
diff --git a/...ase/migrations/create_articles_table.dart → ...4_04_20_003614_create_articles_table.dart b/...ase/migrations/create_articles_table.dart → ...4_04_20_003614_create_articles_table.dart
@@ -8,7 +8,7 @@ class CreateArticlesTable extends Migration {
   }
 
   @override
-  void down(List actions) {
-    actions.add(Schema.dropIfExists(ArticleSchema));
+  void down(List<Schema> schemas) {
+    schemas.add(Schema.dropIfExists(ArticleSchema));
   }
 }
diff --git a/lib/src/models/article/article.dart b/lib/src/models/article/article.dart
@@ -33,7 +33,7 @@ class Article extends Entity<Article> {
     required this.updatedAt,
   });
 
-  BelongsTo<Article, User> get owner => belongsTo<User>();
+  // BelongsTo<Article, User> get owner => belongsTo<User>();
 
   Map<String, dynamic> toJson() => <String, dynamic>{
         'id': id,

diff --git a/pubspec.lock b/pubspec.lock
@@ -25,6 +25,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.13.0"
+  ansi_regex:
+    dependency: transitive
+    description:
+      name: ansi_regex
+      sha256: ca4f2b24a85e797a1512e1d3fe34d5f8429648f78e2268b6a8b5628c8430e643
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2"
+  ansi_strip:
+    dependency: transitive
+    description:
+      name: ansi_strip
+      sha256: "9bb54e10962ac1de86b9b64a278a5b8965a28a2f741975eac7fe9fb0ebe1aaac"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.1+1"
   ansi_styles:
     dependency: transitive
     description:
@@ -137,6 +153,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.9.1"
+  chalkdart:
+    dependency: transitive
+    description:
+      name: chalkdart
+      sha256: "0b7ec5c6a6bafd1445500632c00c573722bd7736e491675d4ac3fe560bbd9cfe"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
   charcode:
     dependency: transitive
     description:
@@ -169,6 +201,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.1"
+  cli_table:
+    dependency: transitive
+    description:
+      name: cli_table
+      sha256: "61b61c6dbfa248d8ec9c65b1d97d1ec1952482765563533087ec550405def016"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
   cli_util:
     dependency: transitive
     description:
@@ -257,6 +297,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.2.0"
+  east_asian_width:
+    dependency: transitive
+    description:
+      name: east_asian_width
+      sha256: a13c5487dab7ddbad48875789819f0ea38a61cbaaa3024ebe7b199521e6f5788
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
   ed25519_edwards:
     dependency: transitive
     description:
@@ -265,6 +313,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.1"
+  emoji_regex:
+    dependency: transitive
+    description:
+      name: emoji_regex
+      sha256: "3a25dd4d16f98b6f76dc37cc9ae49b8511891ac4b87beac9443a1e9f4634b6c7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.5"
   equatable:
     dependency: transitive
     description:
@@ -430,10 +486,10 @@ packages:
     dependency: transitive
     description:
       name: mason_logger
-      sha256: "0e90e637dcfcb7fb6c30b38e71cd41fa0e4e3df6f1da177f8251ac3f15147e9f"
+      sha256: "56c44e588e908ef0d1dbb593e1b4473b8ee5fb48fcc8d645c925ab6c8041ebdf"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.12"
+    version: "0.2.15"
   matcher:
     dependency: transitive
     description:
@@ -803,6 +859,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  string_width:
+    dependency: transitive
+    description:
+      name: string_width
+      sha256: "0ea481fbb6d5e2d70937fea303d8cc9296048da107dffeecf2acb675c8b47e7f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.5"
   synchronized:
     dependency: transitive
     description:
@@ -907,6 +971,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  wcwidth:
+    dependency: transitive
+    description:
+      name: wcwidth
+      sha256: "4e68ce25701e56647cb305ab6d8c75fce5e5196227bcb6ba6886513ac36474c2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.4"
   web:
     dependency: transitive
     description:
@@ -935,10 +1007,10 @@ packages:
     dependency: transitive
     description:
       name: win32
-      sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8"
+      sha256: "0a989dc7ca2bb51eac91e8fd00851297cfffd641aa7538b165c62637ca0eaa4a"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.0"
+    version: "5.4.0"
   yaml:
     dependency: transitive
     description:
@@ -955,26 +1027,12 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
-  yaroo_cli:
-    dependency: "direct overridden"
-    description:
-      path: "../yaroorm/packages/orm_cli"
-      relative: true
-    source: path
-    version: "1.0.0"
   yaroorm:
     dependency: "direct main"
     description:
-      path: "../yaroorm/packages/orm"
+      path: "../yaroorm"
       relative: true
     source: path
     version: "0.0.2"
-  yaroorm_builder:
-    dependency: "direct dev"
-    description:
-      path: "../yaroorm/packages/generator"
-      relative: true
-    source: path
-    version: "1.0.0"
 sdks:
   dart: ">=3.3.0 <4.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
       url: https://github.com/codekeyz/pharaoh.git
       path: packages/pharaoh
   yaroorm:
-    path: ../yaroorm/packages/orm
+    path: ../yaroorm
   collection: ^1.18.0
 
   logger: ^2.0.2+1
@@ -28,10 +28,6 @@ dependencies:
 
 dependency_overrides:
   reflectable:
-  yaroo_cli:
-    path: ../yaroorm/packages/orm_cli
-  yaroorm:
-    path: ../yaroorm/packages/orm
 
 dev_dependencies:
   lints: ^3.0.0
@@ -40,5 +36,3 @@ dev_dependencies:
   melos: ^3.2.0
   build_runner:
   spookie: 
-  yaroorm_builder:
-    path: ../yaroorm/packages/generator
diff --git a/test/backend_test.dart b/test/backend_test.dart
@@ -6,14 +6,13 @@ import 'package:backend/src/models/article/article.dart';
 import 'package:backend/src/models/user/user.dart';
 import 'package:spookie/spookie.dart';
 import 'package:yaroorm/yaroorm.dart';
-import '../database/config.dart' as orm;
+import '../database/database.dart' as database;
 
 import 'backend_test.reflectable.dart';
 
 void main() {
   initializeReflectable();
-
-  DB.init(orm.config);
+  database.initializeORM();
 
   Query.addTypeDef<User>(userTypeData);
   Query.addTypeDef<Article>(articleTypeData);