Added migrations and ORMHelper

Author: JulianFun123

.gitignore

@@ -0,0 +1 @@
+/testinglocal

README.md

@@ -108,6 +108,9 @@ User::table()
         $query->where("id", "1");
     })
 
+    // PHP 7.4+
+    ->or(fn ($query) => $query->where("id", "1") )
+
     // Nesting
     ->or(function($query){
         $query->or(function($query){
@@ -126,4 +129,82 @@ User::table()
     // Offset (requires a limit to be set)
     ->offset(0)
     ->all();
+
+
+User::table()->each(function(User $entry){
+    echo $entry->name."\n";
+});
+
+```
+
+## Migration
+```php
+(new Migrator("main"))
+    ->setLogging(true)
+    ->fromFolder("resources/migrations")
+    ->up();
+
+(new Migrator("main"))
+    ->setLogging(true)
+    ->fromFolder("resources/migrations")
+    ->down(/*default val: 1*/);
+```
+
+#### resources/migrations/migration_22_0_11_create_users.php
+```php
+<?php
+namespace testinglocal\migrations;
+
+use de\interaapps\ulole\orm\Database;
+use de\interaapps\ulole\orm\migration\Blueprint;
+use de\interaapps\ulole\orm\migration\Migration;
+
+/**
+ * CHANGED: 
+ */
+class migration_22_0_11_create_users implements Migration {
+    public function up(Database $database) {
+        return $database->create("users", function (Blueprint $blueprint) {
+            $blueprint->id();
+            $blueprint->string("name");
+            $blueprint->string("password");
+            $blueprint->string("description");
+            $blueprint->enum("gender", ["FEMALE", "MALE", "OTHER", "DO_NOT_ANSWER"])->default('DO_NOT_ANSWER');
+            $blueprint->timestamp("created")->currentTimestamp();
+        });
+    }
+
+    public function down(Database $database) {
+        return $database->drop("users");
+    }
+}
 ```
+
+#### resources/migrations/migration_22_0_13_edit_users.php
+```php
+<?php
+namespace testinglocal\migrations;
+
+use de\interaapps\ulole\orm\Database;
+use de\interaapps\ulole\orm\migration\Blueprint;
+use de\interaapps\ulole\orm\migration\Migration;
+
+/**
+ * CHANGED: 
+ */
+class migration_22_0_13_edit_users implements Migration {
+    public function up(Database $database) {
+        return $database->edit("users", function (Blueprint $blueprint) {
+            $blueprint->string("name")->default("Johnson");
+            $blueprint->string("mail");
+        });
+    }
+
+    public function down(Database $database) {
+        return $database->edit("users", function(Blueprint $blueprint){
+            $blueprint->string("name")->nullable()->default(null);
+            $blueprint->string("mail")->drop();
+        });
+    }
+}
+```

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "interaapps/uloleorm",
-    "version": "2.0",
+    "version": "2.0.1",
     "type": "library",
     "authors": [
         {

de/interaapps/ulole/orm/Database.php

@@ -1,6 +1,8 @@
 <?php
 namespace de\interaapps\ulole\orm;
 
+use de\interaapps\ulole\orm\migration\Blueprint;
+
 class Database {
     private $connection;
 
@@ -15,4 +17,46 @@ public function getConnection(){
         return $this->connection;
     }
 
+    public function create($name, $callable, $ifNotExists = false){
+        $blueprint = new Blueprint();
+        $callable($blueprint);
+        $sql = "CREATE TABLE ".($ifNotExists ? "IF NOT EXISTS " : "")."`".$name."` (\n";
+        $sql .= implode(",\n", $blueprint->getQueries(true));
+        $sql .= "\n) ENGINE = InnoDB;";
+        
+        return $this->connection->query($sql);
+    }
+
+    public function edit($name, $callable){
+        $statement = $this->connection->query("SHOW COLUMNS FROM ".$name.";");
+        $existingColumns = [];
+        foreach ($statement->fetchAll(\PDO::FETCH_NUM) as $row) {
+            array_push($existingColumns, $row[0]);
+        }
+        $blueprint = new Blueprint();
+        $callable($blueprint);
+        $sql = "ALTER TABLE `".$name."`";
+        $comma = false;
+        foreach ($blueprint->getQueries() as $column => $query) {
+            if ($comma)
+                $sql .= ", ";
+                
+            if (in_array($column, $existingColumns))
+                $sql .= (substr( $query, 0, 4 ) === "DROP" ? "" : "CHANGE `".$column."` ").$query;
+            else
+                $sql .= " ADD ".$query;
+            
+            if (!$comma)
+                $comma = true;
+        }
+        $sql .= ";";
+        
+        return $this->connection->query($sql);
+    }
+
+
+    public function drop($name){
+        return $this->connection->query("DROP TABLE `".$name."`;");
+    }
+
 }

de/interaapps/ulole/orm/ORMHelper.php

@@ -0,0 +1,30 @@
+<?php
+namespace de\interaapps\ulole\orm;
+
+/**
+ * Requires ORMModel
+ */
+trait ORMHelper {
+    public static function all($limit = null, $offset = null){
+        $query = static::table();
+        if ($limit !== null)
+            $query->limit($limit);
+
+        if ($offset !== null)
+            $query->offset($offset);
+        return $query->all();
+    }
+
+    public static function get($id) {
+        $instance = new static();
+        return static::table()->where($instance->ormInternals_getFieldName('-id'), $id)->get();
+    }
+
+    public static function where($var1, $var2, $var3 = null) {
+        return static::table()->where($var1, $var2, $var3);
+    }
+
+    public static function like($field, $val) {
+        return static::table()->like($field, $val);
+    }
+}

de/interaapps/ulole/orm/ORMModel.php

@@ -55,9 +55,11 @@ public function insert($database = 'main') : bool {
         $query .= ')';
 
        $statement = UloleORM::getDatabase($database)->getConnection()->prepare($query);
-       
+
        $result = $statement->execute($values);
        $this->{$this->ormInternals_getFieldName('-id')} = UloleORM::getDatabase($database)->getConnection()->lastInsertId();
+       if ($result)
+            $this->ormInternals_entryExists = true;
        return $result;
     }
 

de/interaapps/ulole/orm/Query.php

@@ -40,6 +40,14 @@ public function like($field, $like){
         return $this->where($field, "LIKE", $like);
     }
 
+    public function orLike($field, $like){
+        return $this->orWhere($field, "LIKE", $like);
+    }
+
+    public function search($field, $like){
+        return $this->where($field, "LIKE", "%".$like."%");
+    }
+
     public function or(Callable $callable) : Query{
         $query = new Query($this->database, $this->model);
         $query->temporaryQuery = true;
@@ -90,6 +98,12 @@ public function all() {
         return $result;
     }
 
+    public function each($closure) {
+        foreach ($this->all() as $entry)
+            $closure($entry);
+        return $this;
+    }
+
     public function count() {
         $vars = [];
         $query = $this->buildQuery();

de/interaapps/ulole/orm/UloleORM.php

@@ -11,6 +11,16 @@ public static function register($name, $model) {
         self::$tableNames[$model] = $name;
     }
 
+    public static function registerIfNot($name, $model) {
+        if (!isset(self::$tableNames[$model]))
+            self::$tableNames[$model] = $name;
+    }
+
+    public static function registerMultiple($models = []) {
+        foreach ($models as $name => $model)
+            self::$tableNames[$model] = $name;
+    }
+
     public static function database(string $name, Database $database){
         self::$databases[$name] = $database;
     }

de/interaapps/ulole/orm/migration/Blueprint.php

@@ -0,0 +1,59 @@
+<?php
+namespace de\interaapps\ulole\orm\migration;
+
+class Blueprint {
+    private $columns;
+
+    public function __construct() {
+        $this->columns = [];
+    }
+
+    public function id($name = "id") : Column {
+        $column = (new Column($name, "INT"))
+            ->ai();
+        array_push($this->columns, $column);
+        return $column;
+    }
+
+    public function string($name, $size = null) : Column {
+        $column = new Column($name, $size === null ? "TEXT" : "VARCHAR");
+        array_push($this->columns, $column);
+        return $column;
+    }
+
+    public function int($name, $size = null) : Column {
+        $column = new Column($name, "INT", $size);
+        array_push($this->columns, $column);
+        return $column;
+    }
+
+    public function enum($name, array $set) : Column {
+        $column = new Column($name, "ENUM", $set);
+        array_push($this->columns, $column);
+        return $column;
+    }
+
+    public function timestamp($name) : Column {
+        $column = new Column($name, "TIMESTAMP");
+        array_push($this->columns, $column);
+        return $column;
+    }
+
+    public function getColumns() {
+        return $this->columns;
+    }
+
+    public function getQueries($addKeys = false){
+        $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)."`");
+        }
+        if ($addKeys)
+            $columns[":primary_key"] = "PRIMARY KEY (". implode(",", $primaryKeys) .")";
+
+        return $columns;
+    }
+}