feat: add mysql database driver

.github/workflows/test.yml

@@ -54,7 +54,24 @@ jobs:
           melos exec -- "dart run build_runner build"
 
       - name: Run Unit tests
-        run: melos tests:ci
+        run: melos tests:unit
+
+
+      - name: Setup MariaDB For Integration Test
+        uses: ankane/setup-mariadb@v1
+        with:
+          mariadb-version: "10.11"
+          database: "maria_test_db"
+
+
+      - name: Run Integration tests
+        run: |
+          sudo mysql -e "ALTER USER '$USER'@'localhost' IDENTIFIED BY 'password'; FLUSH PRIVILEGES;"
+          melos tests:integration
+
+      - name: Combine Coverage
+        run: melos coverage
+
 
       - name: Upload Coverage
         uses: codecov/codecov-action@v3

.gitignore

@@ -6,4 +6,4 @@
 
 **/melos_**
 **/coverage
-**.reflectable.dart
+**.reflectable.dart

melos.yaml

@@ -19,9 +19,16 @@ scripts:
     run: |
       melos exec -c 1  -- "dart test" --fail-fast
 
-  tests:ci:
+  tests:unit:
+    run: |
+      melos exec -c 1  -- "dart test --coverage=coverage --exclude-tags integration" --fail-fast
+
+  tests:integration:
+    run: |
+      melos exec -c 1  -- "dart test --coverage=coverage --tags integration" --fail-fast
+
+  coverage:
     run: |
-      melos exec -c 1  -- "dart test --coverage=coverage" --fail-fast
       melos exec -- "dart pub global run coverage:format_coverage --check-ignore --report-on=lib --lcov -o "$MELOS_ROOT_PATH/coverage/$(echo "\$MELOS_PACKAGE_NAME")_lcov.info" -i ./coverage"
       find $MELOS_ROOT_PATH/coverage -type f -empty -print -delete
 

yaroo/lib/db/db.dart

@@ -11,7 +11,7 @@
 
   UseDatabaseConnection(this.name) : _driver = DB.driver(name);
 
-  Query query(String table) => Query.query(table, _driver);
+  Query query(String table) => Query.table(table).driver(_driver);
 }
 
 class DB {

yaroo/lib/db/migration/_migrator.dart

@@ -47,7 +47,9 @@ class Migrator {
           transactor.execute(serialized);
         }
 
-        transactor.insert(Migrator.tableName, {'migration': fileName, 'batch': batchNos});
+        await Query.table(Migrator.tableName)
+            .driver(transactor)
+            .insert({'migration': fileName, 'batch': batchNos}).exec();
 
         await transactor.commit();
 
@@ -61,15 +63,15 @@ class Migrator {
   static Future<void> resetMigrations(DatabaseDriver driver, Iterable<MigrationTask> allTasks) async {
     await ensureMigrationsTableReady(driver);
 
-    final migrationInfoFromDB = await Query.query(Migrator.tableName, driver).orderByDesc('batch').all();
+    final migrationInfoFromDB = await Query.table(Migrator.tableName).driver(driver).orderByDesc('batch').all();
     if (migrationInfoFromDB.isEmpty) {
       print('𐄂 skipped: reason:     no migrations to reset');
       return;
     }
 
     print('------- Resetting migrations  📦 -------\n');
 
-    final Iterable<Rollback> rollbacks = migrationInfoFromDB.map((e) => _MigrationDbData.from(e)).map((e) {
+    final rollbacks = migrationInfoFromDB.map((e) => _MigrationDbData.from(e)).map<Rollback>((e) {
       final found = allTasks.firstWhereOrNull((m) => m.name == e.migration);
       return (batch: e.batch, name: e.migration, migration: found);
     }).whereNotNull();
@@ -80,7 +82,7 @@ class Migrator {
   }
 
   static Future<void> rollBackMigration(DatabaseDriver driver, Iterable<MigrationTask> allTasks) async {
-    final lastBatch = await Query.query(Migrator.tableName, driver).orderByDesc('batch').get();
+    final lastBatch = await Query.table(Migrator.tableName).driver(driver).orderByDesc('batch').get();
     if (lastBatch == null) {
       print('𐄂 skipped: reason:     no migration to rollback');
       return;
@@ -107,12 +109,10 @@ class Migrator {
           schemas.forEach((e) => transactor.execute(e.toScript(driver.blueprint)));
         }
 
-        final deleteSql = DeleteQuery(
-          Migrator.tableName,
-          driver,
-          whereClause: Query.query(Migrator.tableName, driver).where('migration', '=', rollback.name),
-        ).statement;
-        transactor.execute(deleteSql);
+        await Query.table(Migrator.tableName)
+            .driver(transactor)
+            .delete((where) => where.where('migration', '=', rollback.name))
+            .exec();
 
         await transactor.commit();
       });

yaroo/lib/db/migration/_utils.dart

@@ -13,7 +13,7 @@ Future<void> ensureMigrationsTableReady(DatabaseDriver driver) async {
 }
 
 Future<bool> hasAlreadyMigratedScript(String scriptName, DatabaseDriver driver) async {
-  final result = await Query.query(Migrator.tableName, driver).where('migration', '=', scriptName).findOne();
+  final result = await Query.table(Migrator.tableName).driver(driver).where('migration', '=', scriptName).findOne();
   return result != null;
 }
 

yaroo/test/integration_test.dart

@@ -0,0 +1,5 @@
+@Skip('integration tests are not ready yet')
+@Tags(['integration'])
+import 'package:spookie/spookie.dart';
+
+void main() {}

yaroorm/.gitignore

@@ -5,3 +5,4 @@
 # Avoid committing pubspec.lock for library packages; see
 # https://dart.dev/guides/libraries/private-files#pubspeclock.
 pubspec.lock
+*.sqlite

yaroorm/lib/src/database/driver/driver.dart

@@ -1,15 +1,19 @@
+import 'package:yaroorm/src/database/driver/mysql_driver.dart';
+
 import '../../query/primitives/serializer.dart';
 import '../../query/query.dart';
 import '../migration.dart';
 import 'sqlite_driver.dart';
 
-enum DatabaseDriverType { sqlite, pgsql, mongo }
+enum DatabaseDriverType { sqlite, pgsql, mysql, mariadb }
+
+String wrapString(String value) => "'$value'";
 
 class DatabaseConnection {
   final String name;
   final String? url;
   final String? host;
-  final String? port;
+  final int? port;
   final String? username;
   final String? password;
   final String database;
@@ -39,7 +43,7 @@
       charset: connInfo['charset'],
       collation: connInfo['collation'],
       host: connInfo['host'],
-      port: connInfo['port'],
+      port: connInfo['port'] == null ? null : int.parse(connInfo['port']),
       password: connInfo['password'],
       username: connInfo['username'],
       url: connInfo['url'],
@@ -53,7 +57,8 @@
   return switch (value) {
     'sqlite' => DatabaseDriverType.sqlite,
     'pgsql' => DatabaseDriverType.pgsql,
-    'mongo' => DatabaseDriverType.mongo,
+    'mysql' => DatabaseDriverType.mysql,
+    'mariadb' => DatabaseDriverType.mariadb,
     null => throw ArgumentError.notNull('Database Driver'),
     _ => throw ArgumentError.value(value, null, 'Invalid Database Driver provided in configuration')
   };
@@ -69,28 +74,25 @@
   /// Execute scripts on the database.
   ///
   /// Execution varies across drivers
-  Future<void> execute(String script);
+  Future<dynamic> execute(String script);
 
   /// Perform update on the database
-  update(UpdateQuery query);
+  Future<void> update(UpdateQuery query);
 
   /// Perform delete on the database
-  delete(DeleteQuery query);
+  Future<void> delete(DeleteQuery query);
+
+  /// Perform insert on the database
+  Future<dynamic> insert(InsertQuery query);
 
-  insert(String tableName, Map<String, dynamic> data);
+  /// Perform insert on the database
+  Future<dynamic> insertMany(InsertManyQuery query);
+
+  PrimitiveSerializer get serializer;
 }
 
 abstract class DriverTransactor with DriverAble {
   Future<List<Object?>> commit();
-
-  @override
-  void insert(String tableName, Map<String, dynamic> data);
-
-  @override
-  void update(UpdateQuery query);
-
-  @override
-  void delete(DeleteQuery query);
 }
 
 abstract interface class DatabaseDriver with DriverAble {
@@ -99,6 +101,9 @@
     switch (driver) {
       case DatabaseDriverType.sqlite:
         return SqliteDriver(dbConn);
+      case DatabaseDriverType.mariadb:
+      case DatabaseDriverType.mysql:
+        return MySqlDriver(dbConn, driver);
       default:
         throw ArgumentError.value(driver, null, 'Driver not yet supported');
     }
@@ -113,7 +118,7 @@
   /// Performs connection to the database.
   ///
   /// Depend on driver type it may create a connection pool.
-  Future<DatabaseDriver> connect();
+  Future<DatabaseDriver> connect({int? maxConnections, bool? singleConnection, bool? secure});
 
   /// Performs connection to the database.
   ///
@@ -124,17 +129,9 @@
   Future<bool> hasTable(String tableName);
 
   @override
-  Future<int> insert(String tableName, Map<String, dynamic> data);
-
-  @override
-  Future<List<Map<String, dynamic>>> update(UpdateQuery query);
-
-  @override
-  Future<List<Map<String, dynamic>>> delete(DeleteQuery query);
+  Future<int> insert(InsertQuery query);
 
   TableBlueprint get blueprint;
 
-  PrimitiveSerializer get serializer;
-
   Future<void> transaction(void Function(DriverTransactor transactor) transaction);
 }