Merge pull request #22 from WebFiori/dev

New Feature (#21)

Author: usernane

tests/HelloTable.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace webfiori\database\tests;
+
+use webfiori\database\mysql\MySQLTable;
+use webfiori\database\mysql\MySQLColumn;
+/**
+ * Description of HelloTable
+ *
+ * @author Ibrahim
+ */
+class HelloTable extends MySQLTable {
+    public function __construct() {
+        parent::__construct('hello');
+        $this->addColumn('user-id', new MySQLColumn('user_id', 'int', 11));
+        $this->addColumn('username', new MySQLColumn('username', 'varchar', 15));
+        $this->addColumn('pass', new MySQLColumn('password', 'varchar', 64));
+    }
+}

tests/SchemaTest.php

@@ -65,4 +65,48 @@ public function test00() {
         $s->page(5, 40);
         $this->assertEquals("select * from `hello` where `hello`.`user_id` = 31 and `hello`.`user_id` < 44 and `hello`.`username` != 'Ibrahim' limit 40 offset 200",$s->getLastQuery());
     }
+    
+    /**
+     * @test
+     */
+    public function test01() {
+        $connInfo = new ConnectionInfo('mysql','root', '123456', 'testing_db', '127.0.0.1');
+        $s = new Database($connInfo);
+        
+        $s->table(HelloTable::class)->drop();
+        $this->assertEquals('drop table `hello`;', $s->getLastQuery());
+        $s->createTable();
+        $this->assertEquals("create table if not exists `hello` (\n"
+                . "    `user_id` int not null,\n"
+                . "    `username` varchar(15) not null collate utf8mb4_unicode_520_ci,\n"
+                . "    `password` varchar(64) not null collate utf8mb4_unicode_520_ci\n\n"
+                . ")\n"
+                . "engine = InnoDB\n"
+                . "default charset = utf8mb4\n"
+                . "collate = utf8mb4_unicode_520_ci;", $s->getLastQuery());
+        $s->table('hello')->insert([
+            'user-id' => 33,
+            'username' => 'Ibrahim',
+            'pass' => 'rand_pass'
+        ]);
+        $this->assertEquals('insert into `hello` (`user_id`, `username`, `password`) '
+                . "values (33, 'Ibrahim', 'rand_pass');", $s->getLastQuery());
+        $s->table('hello')->select();
+        $this->assertEquals('select * from `hello`',$s->getLastQuery());
+        $s->where('user-id', '=', 66);
+        $this->assertEquals('select * from `hello` where `hello`.`user_id` = 66',$s->getLastQuery());
+        $s->where('user-id', '=', 77);
+        $this->assertEquals('select * from `hello` where `hello`.`user_id` = 66 and `hello`.`user_id` = 77',$s->getLastQuery());
+        $s->clear();
+        $s->table('hello')->select()->where(
+                $s->where(
+                        $s->where('user-id', '=', 31)
+                        )->where('user-id', '<', 44, 'or')
+                )->where('username', '!=', 'Ibrahim', 'and');
+        $this->assertEquals("select * from `hello` where `hello`.`user_id` = 31 and `hello`.`user_id` < 44 and `hello`.`username` != 'Ibrahim'",$s->getLastQuery());
+        $s->page(1, 40);
+        $this->assertEquals("select * from `hello` where `hello`.`user_id` = 31 and `hello`.`user_id` < 44 and `hello`.`username` != 'Ibrahim' limit 40 offset 40",$s->getLastQuery());
+        $s->page(5, 40);
+        $this->assertEquals("select * from `hello` where `hello`.`user_id` = 31 and `hello`.`user_id` < 44 and `hello`.`username` != 'Ibrahim' limit 40 offset 200",$s->getLastQuery());
+    }
 }

tests/boot.php

@@ -73,6 +73,8 @@
 require_once $rootDir.$DS.'webfiori'.$DS.'database'.$DS.'mssql'.$DS.'MSSQLConnection.php';
 
 require_once $rootDir.'tests'.$DS.'mssql'.$DS.'MSSQLTestSchema.php';
+require_once $rootDir.'tests'.$DS.'HelloTable.php';
+
 use webfiori\database\ConnectionInfo;
 use webfiori\database\mysql\MySQLConnection;
 use webfiori\database\tests\MySQLTestSchema;

webfiori/database/AbstractQuery.php

@@ -1044,7 +1044,13 @@ public function setTable(Table $table) {
      * @since 1.0
      */
     public function table($tblName) {
-        $tableObj = $this->getSchema()->getTable($tblName);
+        $tableObj = $this->checkIsClass($tblName);
+        
+        if ($tableObj === null) {
+            $tableObj = $this->getSchema()->getTable($tblName);
+        } else {
+            $this->getSchema()->addTable($tableObj);
+        }
         $this->prevQueryObj = $this->copyQuery();
 
         if (strlen($this->query) != 0) {
@@ -1056,6 +1062,21 @@ public function table($tblName) {
 
         return $this;
     }
+    private function checkIsClass($str) {
+        if (class_exists($str)) {
+            try {
+                $clazz = new $str();
+                if ($clazz instanceof Table) {
+                    return $clazz;
+                }
+            } catch (Exception $ex) {
+
+            } catch (\ErrorException $ex) {
+                
+            }
+        }
+    }
+
     /**
      * Constructs a query which will truncate a database table when executed.
      *