Merge branch '1-2-0' into 'main'

1 2 0

See merge request fluxlabs/flux-eco/storage!5

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [1.2.0]
+* use swoole PDOConfig OR mysql_pdo
+
 ## [1.1.1]
 * fix tablebuilder
 

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "flux-eco/storage",
   "description": "Handling mysql databases with json based table schemas",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "keywords": [
     "flux-eco",
     "storage",

src/Adapters/Config.php

@@ -6,6 +6,7 @@
 use FluxEco\Storage\Adapters;
 use FluxEco\Storage\Env;
 use FluxEco\Storage\Core;
+use Swoole\Database\PDOConfig;
 
 class Config implements Core\Ports\Config
 {
@@ -29,13 +30,30 @@ private function __construct(
     public static function newFromEnv(string $tableName, array $jsonSchema, string $envPrefix = '') : self
     {
         $apiEnv = Env::new($envPrefix);
-        $databaseConfig = Adapters\MySqlDatabase\DatabaseConfig::new(
-            $apiEnv->getHost(),
-            $apiEnv->getDriver(),
-            $apiEnv->getName(),
-            $apiEnv->getUser(),
-            $apiEnv->getPassword()
-        );
+
+        if(class_exists('PDOConfig')) {
+            $databaseConfig = (new PDOConfig())
+                ->withHost( $apiEnv->getHost())
+                ->withPort(3306)
+                // ->withUnixSocket('/tmp/mysql.sock')
+                ->withDbName($apiEnv->getName())
+                ->withCharset('utf8mb4')
+                ->withUsername($apiEnv->getUser())
+                ->withPassword($apiEnv->getPassword());
+        } else {
+            $databaseConfig = Adapters\MySqlDatabase\DatabaseConfig::new(
+                $apiEnv->getHost(),
+                $apiEnv->getDriver(),
+                $apiEnv->getName(),
+                $apiEnv->getUser(),
+                $apiEnv->getPassword()
+            );
+        }
+
+
+
+
+
 
         $databaseClient = Adapters\MySqlDatabase\MysqlDatabaseClient::new(
             $tableName,

src/Adapters/MySqlDatabase/DatabaseConfig.php

@@ -45,6 +45,11 @@ public static function new(
         );
     }
 
+    final public function getDbName() : string
+    {
+        return $this->database;
+    }
+
     final public function getDatabase() : string
     {
         return $this->database;

src/Adapters/MySqlDatabase/MysqlDatabaseClient.php

@@ -13,19 +13,19 @@
 use Laminas\Db\Sql\Select;
 use Laminas\Db\Sql\Sql;
 use Laminas\Db\TableGateway\TableGateway;
-
+use Swoole\Database\PDOConfig;
 
 class MysqlDatabaseClient implements Ports\Database\DatabaseClient
 {
     protected static array $instances = [];
 
-    private DatabaseConfig $databaseConfig;
+    private DatabaseConfig|PDOConfig $databaseConfig;
     private Adapter $dbAdapter;
     private Sql $sql;
     private TableGateway $tableGateway;
     private array $jsonSchema;
 
-    private function __construct(DatabaseConfig $databaseConfig, Adapter $dbAdapter, Sql $sql, TableGateway $tableGateway, array $jsonSchema)
+    private function __construct(DatabaseConfig|PDOConfig $databaseConfig, Adapter $dbAdapter, Sql $sql, TableGateway $tableGateway, array $jsonSchema)
     {
         $this->databaseConfig = $databaseConfig;
         $this->dbAdapter = $dbAdapter;
@@ -37,10 +37,10 @@ private function __construct(DatabaseConfig $databaseConfig, Adapter $dbAdapter,
     public static function new(
         string         $tableName,
         array          $jsonSchema,
-        DatabaseConfig $databaseConfig
+        DatabaseConfig|PDOConfig $databaseConfig
     ): self
     {
-        $databaseName = $databaseConfig->getDatabase();
+        $databaseName = $databaseConfig->getDbname();
 
         if (empty(static::$instances[$databaseName]) === true || empty(static::$instances[$databaseName][$tableName]) === true) {
             $dbAdapter = new Adapter($databaseConfig->toArray());
@@ -167,7 +167,7 @@ private function addColumns(array $columns, CreateTable $table): void
 
     final public function storageExists(Handlers\StorageExistsCommand $storageExistsCommand): bool
     {
-        $dataBaseName = $this->databaseConfig->getDatabase();
+        $dataBaseName = $this->databaseConfig->getDbname();
         $tableName = $storageExistsCommand->getTableName();
         $dbAdapter = $this->dbAdapter;