feat(orm): updated api structure

Author: Kazi-Waseef-5002812

packages/dartseid_orm/example/api/basic.dart

@@ -1,11 +1,14 @@
 import 'package:dartseid_orm/dartseid_orm.dart';
 
 class DormMockAdapter implements DormAdapterBase {
-  final dynamic _connection;
+  @override
+  late Dorm dorm;
+  @override
+  final dynamic connection;
 
   DormMockAdapter({
-    required dynamic connection,
-  }) : _connection = connection;
+    required this.connection,
+  });
 
   @override
   Future<void> init() {
@@ -39,6 +42,11 @@ class DormMockAdapter implements DormAdapterBase {
     // TODO: implement transaction
     throw UnimplementedError();
   }
+
+  @override
+  void setDormInstance(Dorm dorm) {
+    this.dorm = dorm;
+  }
 }
 
 Future<dynamic> dorming() async {
@@ -49,8 +57,9 @@ Future<dynamic> dorming() async {
   final t = a.table(
     "users",
     {
-      "id": ColumnInt(),
+      "id": ColumnInt()..nullable(),
       "name": ColumnString(),
+      "json": ColumnJson(),
     },
     converter: (
       fromJson: (Map<String, dynamic> j) {},
@@ -68,6 +77,7 @@ Future<dynamic> dorming() async {
   final data = await t.transaction().start(
     (trx) async {
       final r = t.findOne(transaction: trx)
+        ..where({"id": eq(10)})
         ..where(
           and([
             {
@@ -104,6 +114,9 @@ Future<dynamic> dorming() async {
           ]),
           joinType: JoinOperation.left,
         )
+        ..group("id")
+        ..sort({"name": 1})
+        ..having(and([]))
         ..limit(10)
         ..skip(0);
 

packages/dartseid_orm/lib/src/adapter.dart

@@ -2,13 +2,17 @@ import 'dart:async';
 
 import 'package:dartseid_orm/src/core.dart';
 import 'package:dartseid_orm/src/query.dart';
+import 'package:meta/meta.dart';
 
 abstract interface class DormAdapterBase {
-  final dynamic _connection;
+  @protected
+  final dynamic connection;
+  @protected
+  late Dorm dorm;
 
   DormAdapterBase({
-    required dynamic connection,
-  }) : _connection = connection;
+    required this.connection,
+  });
 
   Future<void> init();
   Future<Map<String, dynamic>> operate({
@@ -28,6 +32,9 @@ abstract interface class DormAdapterBase {
     int? limit,
     int? skip,
   });
+
+  void setDormInstance(Dorm dorm);
+
   DormTransaction transaction();
 }
 
@@ -37,47 +44,13 @@ abstract class DormTransaction {
   bool isRolledBack = false;
 
   Future<void> commit() async {
-    if (!isStarted) {
-      throw DormException(
-        message: "Cannot Commit a transaction that has not been started",
-        originalError: null,
-      );
-    }
-    if (isCommitted) {
-      throw DormException(
-        message: "Cannot Commit a transaction that is already committed",
-        originalError: null,
-      );
-    }
-    if (isRolledBack) {
-      throw DormException(
-        message: "Cannot Commit a transaction that has been rolled back",
-        originalError: null,
-      );
-    }
+    _checkPrecondition("Commit");
     await _commit();
     isCommitted = true;
   }
 
   Future<void> rollback() async {
-    if (!isStarted) {
-      throw DormException(
-        message: "Cannot Rollback a transaction that has not been started",
-        originalError: null,
-      );
-    }
-    if (isCommitted) {
-      throw DormException(
-        message: "Cannot Rollback a transaction that is already committed",
-        originalError: null,
-      );
-    }
-    if (isRolledBack) {
-      throw DormException(
-        message: "Cannot Rollback a transaction that is already rolled back",
-        originalError: null,
-      );
-    }
+    _checkPrecondition("Rollback");
     await _rollback();
     isRolledBack = true;
   }
@@ -86,6 +59,7 @@ abstract class DormTransaction {
     FutureOr<T> Function(DormTransaction trx)? callback,
   ]) async {
     try {
+      _checkStartPreCondition();
       await _start();
       isStarted = true;
       if (callback == null) {
@@ -107,4 +81,40 @@ abstract class DormTransaction {
   Future<void> _rollback();
 
   Future<void> _start();
+
+  void _checkStartPreCondition() {
+    if (isCommitted) {
+      throw DormException(
+        message: "Cannot Start a transaction that is already committed",
+        originalError: null,
+      );
+    }
+    if (isRolledBack) {
+      throw DormException(
+        message: "Cannot Start a transaction that is already rolled back",
+        originalError: null,
+      );
+    }
+  }
+
+  void _checkPrecondition(String op) {
+    if (!isStarted) {
+      throw DormException(
+        message: "Cannot $op a transaction that has not been started",
+        originalError: null,
+      );
+    }
+    if (isCommitted) {
+      throw DormException(
+        message: "Cannot $op a transaction that is already committed",
+        originalError: null,
+      );
+    }
+    if (isRolledBack) {
+      throw DormException(
+        message: "Cannot $op a transaction that has been rolled back",
+        originalError: null,
+      );
+    }
+  }
 }

packages/dartseid_orm/lib/src/core.dart

@@ -33,7 +33,9 @@ class Dorm with DormTable {
     String? name,
   }) async {
     await adapter.init();
-    return Dorm._(adapter: adapter, name: name);
+    final dorm = Dorm._(adapter: adapter, name: name);
+    adapter.setDormInstance(dorm);
+    return dorm;
   }
 }
 

packages/dartseid_orm/lib/src/query.dart

@@ -9,6 +9,7 @@ Map<String, WhereParam> and(List<Map<String, WhereParam>> value) {
   for (final element in value) {
     element.forEach((key, _) {
       element[key]?.isAnd = true;
+      element[key]?.isOr = false;
     });
     mergedMap.addAll(element);
   }
@@ -20,6 +21,7 @@ Map<String, WhereParam> or(List<Map<String, WhereParam>> value) {
   for (final element in value) {
     element.forEach((key, _) {
       element[key]?.isOr = true;
+      element[key]?.isAnd = false;
     });
     mergedMap.addAll(element);
   }

packages/dartseid_orm/lib/src/table.dart

@@ -122,43 +122,49 @@ class DormTableSchema {
   }
 }
 
-abstract class ColumnMeta {}
+class ColumnMeta {
+  void nullable() {
+    // do something
+  }
+}
 
-class ColumnInt implements ColumnMeta {}
+class ColumnInt extends ColumnMeta {}
 
-class ColumnIntRange implements ColumnMeta {}
+class ColumnIntRange extends ColumnMeta {}
 
-class ColumnFloat implements ColumnMeta {}
+class ColumnFloat extends ColumnMeta {}
 
-class ColumnBool implements ColumnMeta {}
+class ColumnBool extends ColumnMeta {}
 
-class ColumnString implements ColumnMeta {
+class ColumnString extends ColumnMeta {
   final dynamic search;
 
   ColumnString({this.search});
 }
 
-class ColumnStringEnum implements ColumnMeta {}
+class ColumnStringEnum extends ColumnMeta {}
+
+class ColumnStringSet extends ColumnMeta {}
 
-class ColumnStringSet implements ColumnMeta {}
+class ColumnBinary extends ColumnMeta {}
 
-class ColumnBinary implements ColumnMeta {}
+class ColumnDate extends ColumnMeta {}
 
-class ColumnDate implements ColumnMeta {}
+class ColumnDateRange extends ColumnMeta {}
 
-class ColumnDateRange implements ColumnMeta {}
+class ColumnJson extends ColumnMeta {}
 
-class ColumnJson implements ColumnMeta {}
+class ColumnComposite extends ColumnMeta {}
 
-class ColumnComposite implements ColumnMeta {}
+class ColumnGeoJson extends ColumnMeta {}
 
-class ColumnGeoJson implements ColumnMeta {}
+class ColumnObjectId extends ColumnMeta {}
 
-class ColumnArray implements ColumnMeta {}
+class ColumnArray extends ColumnMeta {}
 
-abstract interface class ColumnCustomDomain implements ColumnMeta {}
+abstract interface class ColumnCustomDomain extends ColumnMeta {}
 
-class ColumnCustom implements ColumnMeta {
+class ColumnCustom extends ColumnMeta {
   final String raw;
 
   ColumnCustom({required this.raw});

packages/dartseid_orm/pubspec.yaml

@@ -8,6 +8,7 @@ environment:
 
 # Add regular dependencies here.
 dependencies:
+  meta: ^1.9.1
   # path: ^1.8.0
 
 dev_dependencies: