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

1-3-0 See merge request fluxlabs/flux-eco/storage!8
flux-eco · Apr 26, 2022 · 7d2bcc5 · 7d2bcc5
2 parents 95da287 + 8af54dc
commit 7d2bcc5
Show file tree

Hide file tree

Showing 26 changed files with 516 additions and 133 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [1.3.0]
+* feature: filter, limit, fulltextsearch
+
 ## [1.2.2]
 * fix bugs in database config
 

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "flux-eco/storage",
   "description": "Handling mysql databases with json based table schemas",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "keywords": [
     "flux-eco",
     "storage",

diff --git a/fn/getData.php b/fn/getData.php
@@ -4,7 +4,20 @@
 
 use FluxEco\Storage;
 
-function getData(string $tableName, array $jsonSchema, string $envPrefix = '', array $filter = [], int $sequenceOffSet = 0, int $limit = 0, ?string $orderBy = null) : array
-{
-    return Storage\Api::newFromEnv($tableName, $jsonSchema, $envPrefix)->getData($filter, $sequenceOffSet, $limit, $orderBy);
+function getData(
+    string $tableName,
+    array $jsonSchema,
+    string $envPrefix = '',
+    ?array $filter = null, ?int $offset = null, ?int $limit = null, ?string $orderBy = null, ?string $search = null
+) : array {
+    $joinOperations = [];
+    if (key_exists('joins', $jsonSchema) && count($jsonSchema['joins']) > 0) {
+        foreach ($jsonSchema['joins'] as $join) {
+            $joinOperations[] = Storage\JoinOperationRequest::newInnerJoin(
+                $join['foreignTableName'],
+                $join['joinExpression']
+            );
+        }
+    }
+    return Storage\Api::newFromEnv($tableName, $jsonSchema, $envPrefix)->getData($filter, $offset, $limit, $orderBy, $search, $joinOperations);
 }
diff --git a/fn/storeData.php b/fn/storeData.php
@@ -4,7 +4,7 @@
 
 use FluxEco\Storage;
 
-function storeData(string $tableName, array $jsonSchema, string $envPrefix = '', array $filter = [], array $data) : void
+function storeData(string $tableName, array $jsonSchema, string $envPrefix = '', array $filter = [], array $data = []) : void
 {
     Storage\Api::newFromEnv($tableName, $jsonSchema, $envPrefix)->storeData($filter, $data);
 }
diff --git a/src/Adapters/Config.php b/src/Adapters/Config.php
@@ -2,11 +2,9 @@
 
 namespace FluxEco\Storage\Adapters;
 
-use FluxEco\Storage\Adapters\MySqlDatabase\DatabaseConfig;
 use FluxEco\Storage\Adapters;
 use FluxEco\Storage\Env;
 use FluxEco\Storage\Core;
-use Swoole\Database\PDOConfig;
 
 class Config implements Core\Ports\Config
 {

diff --git a/src/Adapters/MySqlDatabase/Commands/CreateStorageAdapter.php b/src/Adapters/MySqlDatabase/Commands/CreateStorageAdapter.php
@@ -14,6 +14,8 @@ class CreateStorageAdapter
     private array $uniqueKey = [];
     /** @var Column[] */
     private array $ddlColumns;
+    private array $indexes;
+
 
     /**
      * @param Column[] $ddlColumns
@@ -22,12 +24,15 @@ private function __construct(
         string $tableName,
         ?string  $primaryKey = null,
         array $uniqueKey,
-        array  $ddlColumns)
+        array  $ddlColumns,
+        array $indexes
+    )
     {
         $this->tableName = $tableName;
         $this->primaryKey = $primaryKey;
         $this->uniqueKey = $uniqueKey;
         $this->ddlColumns = $ddlColumns;
+        $this->indexes = $indexes;
     }
 
     public static function fromApplicationCommmand(Application\Handlers\CreateStorageCommand $createStorageCommand, DdlColumnFactory $ddlColumnFactory): self
@@ -38,6 +43,7 @@ public static function fromApplicationCommmand(Application\Handlers\CreateStorag
         $primaryKey = $storage->getPrimaryKey();
         $uniqueKey = $storage->getUniqueKey();
         $storageColumns = $storage->getColumns();
+        $indexes = $storage->getIndexes();
         $ddlColumns = [];
         foreach ($storageColumns as $storageColumn) {
             $ddlColumns[] = $ddlColumnFactory->createDdlColumnfromStorageColumn($storageColumn);
@@ -47,7 +53,9 @@ public static function fromApplicationCommmand(Application\Handlers\CreateStorag
             $tableName,
             $primaryKey,
             $uniqueKey,
-            $ddlColumns);
+            $ddlColumns,
+            $indexes
+        );
     }
 
     public function hasUniqueKey(): bool
@@ -82,5 +90,12 @@ final public function getUniqueKey(): array
         return $this->uniqueKey;
     }
 
+    public function getIndexes() : array
+    {
+        return $this->indexes;
+    }
+
+
+
 
 }
diff --git a/src/Adapters/MySqlDatabase/Factories/DdlColumnFactory.php b/src/Adapters/MySqlDatabase/Factories/DdlColumnFactory.php
@@ -35,6 +35,8 @@ public function createDdlColumnfromStorageColumn(Ports\Database\Models\Column $c
                 return new Column\Integer($column->getName(), $column->isNullable());
             case Models\TextColumn::class:
                 return new Column\Text($column->getName(), 0, $column->isNullable());
+            case Models\BlobColumn::class:
+                return  new Column\Blob($column->getName(), 0, $column->isNullable());
             case Models\VarcharColumn::class:
                 return new Column\Varchar($column->getName(), 255, $column->isNullable());
         }