Fixed normal migrator

interaapps · Jul 24, 2022 · 7297b4f · 7297b4f
1 parent 1e992a8
commit 7297b4f
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "interaapps/uloleorm",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "type": "library",
     "authors": [
         {

diff --git a/de/interaapps/ulole/orm/Database.php b/de/interaapps/ulole/orm/Database.php
@@ -88,6 +88,9 @@ public function autoMigrate(): Database {
         }
 
         foreach (UloleORM::getModelInformationList() as $modelInformation) {
+            if ($modelInformation->isAutoMigrateDisabled())
+                continue;
+
             $fields = $modelInformation->getFields();
 
             $columns = array_map(function ($field) use ($modelInformation) {

diff --git a/de/interaapps/ulole/orm/ModelInformation.php b/de/interaapps/ulole/orm/ModelInformation.php
@@ -17,6 +17,7 @@ class ModelInformation {
      */
     private array $fields;
     private ?string $name;
+    private bool $disableAutoMigrate = false;
 
     /**
      * @throws ReflectionException
@@ -31,6 +32,7 @@ public function __construct(
         if (count($tableAttributes) > 0) {
             $tableAttribute = $tableAttributes[0]->newInstance();
             $this->name = $tableAttribute->value;
+            $this->disableAutoMigrate = $tableAttribute->disableAutoMigrate;
         } else {
             $this->name = strtolower(preg_replace('/(?<!^)[A-Z]/', '_$0', $reflection->getShortName()));
             if (!str_ends_with($this->name, "s"))
@@ -77,11 +79,11 @@ public function setName(string $name): ModelInformation {
     }
 
     public function getFieldName(string $field): string {
-        return $this->getColumnInformation($field)->getFieldName();
+        return $this->getColumnInformation($field)?->getFieldName() ?? $field;
     }
 
-    public function getColumnInformation(string $name): ColumnInformation {
-        return $this->fields[$name];
+    public function getColumnInformation(string $name): ColumnInformation|null {
+        return $this->fields[$name] ?? null;
     }
 
     public function getFieldValue($obj, string $field): string {
@@ -93,4 +95,8 @@ public function getFieldValue($obj, string $field): string {
     public function getIdentifierValue($obj): string {
         return $obj->{$this->getIdentifier()};
     }
+
+    public function isAutoMigrateDisabled(): bool {
+        return $this->disableAutoMigrate;
+    }
 }
diff --git a/de/interaapps/ulole/orm/attributes/Table.php b/de/interaapps/ulole/orm/attributes/Table.php
@@ -8,7 +8,8 @@
 class Table {
     public function __construct(
         /** Name */
-        public string $value
+        public string $value,
+        public bool $disableAutoMigrate = false
     ) {
     }
 }
diff --git a/de/interaapps/ulole/orm/migration/Blueprint.php b/de/interaapps/ulole/orm/migration/Blueprint.php
@@ -116,9 +116,9 @@ public function getQueries($addKeys = false): array {
         $columns = [];
         $primaryKeys = [];
         foreach ($this->columns as $column) {
-            $columns[$column->name] = $column->generateStructure();
-            if ($column->primary)
-                array_push($primaryKeys, "`" . ($column->renameTo === null ? $column->name : $column->renameTo) . "`");
+            $columns[$column->getName()] = $column->generateStructure();
+            if ($column->isPrimary())
+                $primaryKeys[] = "`" . ($column->getRenameTo() === null ? $column->getName() : $column->getRenameTo()) . "`";
         }
         if ($addKeys)
             $columns[":primary_key"] = "PRIMARY KEY (" . implode(",", $primaryKeys) . ")";

diff --git a/de/interaapps/ulole/orm/migration/Column.php b/de/interaapps/ulole/orm/migration/Column.php
@@ -105,4 +105,52 @@ public function generateStructure(): string {
             $structure .= "AUTO_INCREMENT";
         return $structure;
     }
+
+    public function getName(): ?string {
+        return $this->name;
+    }
+
+    public function isPrimary(): bool {
+        return $this->primary;
+    }
+
+    public function isAi(): bool {
+        return $this->ai;
+    }
+
+    public function isDefaultDefined(): bool {
+        return $this->defaultDefined;
+    }
+
+    public function isDrop(): bool {
+        return $this->drop;
+    }
+
+    public function isEscapeDefault(): bool {
+        return $this->escapeDefault;
+    }
+
+    public function isNullable(): bool {
+        return $this->nullable;
+    }
+
+    public function isUnique(): bool {
+        return $this->unique;
+    }
+
+    public function getDefault(): mixed {
+        return $this->default;
+    }
+
+    public function getRenameTo(): ?string {
+        return $this->renameTo;
+    }
+
+    public function getSize(): mixed {
+        return $this->size;
+    }
+
+    public function getType(): string {
+        return $this->type;
+    }
 }
diff --git a/de/interaapps/ulole/orm/migration/Migrator.php b/de/interaapps/ulole/orm/migration/Migrator.php
@@ -16,12 +16,12 @@ public function __construct(string $database) {
         $this->migrations = [];
         $db = UloleORM::getDatabase($this->database);
         (new CreateMigrationsMigration())->up($db);
-        UloleORM::register("uloleorm_migrations", MigrationModel::class);
+        UloleORM::register(MigrationModel::class);
 
         if (MigrationModel::table($this->database)->count() == 0) {
             if ($this->logging) echo "Creating first migration\n";
             $migration = new MigrationModel;
-            $migration->migrated_model = 'de\interaapps\ulole\orm\migration\table\CreateMigrationsMigration';
+            $migration->migratedModel = 'de\interaapps\ulole\orm\migration\table\CreateMigrationsMigration';
             $migration->version = 0;
             $migration->save();
         }
@@ -49,25 +49,25 @@ public function up(): Migrator {
         $db = UloleORM::getDatabase($this->database);
 
         $latestVersion = 0;
-        $latestVersionObject = MigrationModel::table($this->database)->orderBy("version", true)->get();
+        $latestVersionObject = MigrationModel::table($this->database)->orderBy("version", true)->first();
         if ($latestVersionObject !== null) {
             $latestVersion = $latestVersionObject->version;
         }
 
         $newerVersion = $latestVersion + 1;
         foreach ($this->migrations as $clazz) {
-            if (MigrationModel::table($this->database)->where("migrated_model", $clazz)->get() === null) {
+            if (MigrationModel::table($this->database)->where("migrated_model", $clazz)->first() === null) {
                 $returnValue = (new $clazz())->up($db);
                 if ($returnValue === null)
                     $returnValue = true;
                 if ($returnValue) {
                     $migration = new MigrationModel;
-                    $migration->migrated_model = $clazz;
+                    $migration->migratedModel = $clazz;
                     $migration->version = $newerVersion;
                     if ($migration->save())
-                        if ($this->logging) echo "Migrated " . $migration->migrated_model . "\n";
+                        if ($this->logging) echo "Migrated " . $migration->migratedModel . "\n";
                         else
-                            if ($this->logging) echo "[x] Couldn't migrated " . $migration->migrated_model . "\n";
+                            if ($this->logging) echo "[x] Couldn't migrated " . $migration->migratedModel . "\n";
                 }
             }
         }
@@ -78,7 +78,7 @@ public function down($down = 1): Migrator {
         $db = UloleORM::getDatabase($this->database);
 
         $version = 0;
-        $latestVersionObject = MigrationModel::table($this->database)->orderBy("version", true)->get();
+        $latestVersionObject = MigrationModel::table($this->database)->orderBy("version", true)->first();
         if ($latestVersionObject !== null) {
             $version = $latestVersionObject->version;
         }

diff --git a/de/interaapps/ulole/orm/migration/table/MigrationModel.php b/de/interaapps/ulole/orm/migration/table/MigrationModel.php
@@ -2,10 +2,23 @@
 
 namespace de\interaapps\ulole\orm\migration\table;
 
+use de\interaapps\ulole\orm\attributes\Column;
+use de\interaapps\ulole\orm\attributes\Table;
 use de\interaapps\ulole\orm\ORMModel;
 
+#[Table("uloleorm_migrations", disableAutoMigrate: true)]
 class MigrationModel {
     use ORMModel;
 
-    public $id, $migrated_model, $version, $created;
+    #[Column]
+    public int $id;
+
+    #[Column]
+    public ?string $migratedModel;
+
+    #[Column]
+    public string $version;
+
+    #[Column]
+    public string $created;
 }
diff --git a/uppm.json b/uppm.json
@@ -1,6 +1,6 @@
 {
     "name": "uloleorm",
-    "version": "3.1.0",
+    "version": "3.1.1",
     "repositories": [],
     "run": {},
     "build": {},