fix some bugs and add supporting of numbers' types

Author: SergeyGrishin

lib/orm/DataBase/Table.php

@@ -35,27 +35,30 @@ abstract class Table
      */
     protected $table_name = "";
 
+    /**
+     * Init table, set fields' types and set name of table
+     */
     public function initTable()
     {
         $this->reflection_class = new \ReflectionClass($this);
         $this->table_fields = $this->getTableFields(true);
         $this->initTableName();
     }
 
+    /**
+     * Migrate database from classes to sql and execute migration script.
+     * @return bool, true if migration successfully finished
+     * @throws MigrationException
+     */
     public function migrate()
     {
         try {
             $generator = $this->getQueryGeneratorInstance();
-            $create_database_query = $generator->createDataBase(QueryMemento::createInstance()->getStorage()["dbname"]);
-            $create_table_query = $generator->createTable($this->table_name, $this->table_fields);
-
-            print_r($create_table_query);
-
-//            (new QueryExecutor(PdoAdapter::getInstance()
-//                ->getPdoObject()->prepare(
-//                    (new Migration($this->table_fields, $this->table_name))
-//                        ->buildMigrationSqlCode()), []))
-//                ->executeSql();
+            (new QueryExecutor($generator->createDataBase(QueryMemento::createInstance()->getStorage()["dbname"]), []))
+                    ->executeSql();
+            (new QueryExecutor($generator->createTable($this->table_name, $this->table_fields), []))
+                    ->executeSql();
+            return true;
         } catch (\PDOException $e) {
             throw new MigrationException($e->getMessage());
         }

lib/orm/Exceptions/ExceptionsMessages.php

@@ -16,4 +16,9 @@ public static function sizeOfValueBiggerThanSizeOfField($valueSize, $fieldSize)
         return "Size of value bigger than size of field. Expected <b>{$valueSize}</b> symbols but received <b>{$fieldSize}</b>";
     }
 
+    public static function unsupportedTypeOfField($type)
+    {
+        return "{$type} is unsupported type of field";
+    }
+
 }

lib/orm/Query/MysqlQueryGenerator.php

@@ -5,8 +5,10 @@
 
 use orm\DataBase\fields\DateTime;
 use orm\DataBase\fields\ForeignKey;
+use orm\DataBase\fields\Number;
 use orm\DataBase\fields\PrimaryKey;
 use orm\DataBase\fields\StringField;
+use orm\Exceptions\ExceptionsMessages;
 use orm\Exceptions\MigrationException;
 
 class MysqlQueryGenerator implements QueryGeneratorInterface
@@ -55,7 +57,7 @@ public function selectAll($table)
 
     public function createDataBase($dbname)
     {
-        return $this->pdo->prepare("create database if not exists `{$dbname}` default character set utf8 collate" .
+        return $this->pdo->prepare("create database if not exists `{$dbname}` default character set utf8 collate " .
                 "utf8_general_ci;\nuse `{$dbname}`;\n");
     }
 
@@ -69,20 +71,23 @@ public function createTable($table, $fields)
                 $query .= "`{$key}` {$field->type}({$field->size}) not null primary key auto_increment,\n";
             } elseif ($field instanceof ForeignKey) {
                 $query .= "`{$key}` int not null,\n";
-                $table = new $field->table();
-                $reflection = new \ReflectionClass($table);
+                $current_table = new $field->table();
+                $reflection = new \ReflectionClass($current_table);
                 $property = $reflection->getProperty("table_name");
                 $property->setAccessible(true);
                 $foreign_keys .= "alter table `{$table}` add constraint `{$key}_fk` foreign key (`{$key}`)" .
-                        " references `{$property->getValue($table)}` (`{$field->field}`) on delete " .
+                        " references `{$property->getValue($current_table)}` (`{$field->field}`) on delete " .
                         "{$field->on_delete} on update {$field->on_update};\n";
                 $property->setAccessible(false);
             } elseif ($field instanceof StringField) {
                 $query .= "`{$key}` {$field->type}({$field->size}) not null,\n";
             } elseif ($field instanceof DateTime) {
                 $query .= "`{$key}` {$field->type} not null,\n";
+            } elseif ($field instanceof Number) {
+                $auto_increment = ($field->auto_increment) ? "auto_increment" : "";
+                $query .= "`{$key}` {$field->type}({$field->size}) {$field->attribute} not null {$auto_increment},\n";
             } else {
-                throw new MigrationException("Migration Exception");
+                throw new MigrationException(ExceptionsMessages::unsupportedTypeOfField(gettype($field)));
             }
         }
         return $this->pdo->prepare(substr($query, 0, -2) . "\n) engine=InnoDB default charset=utf8;\n" .