Add database

packaged · Jun 3, 2024 · 7f93ee1 · 7f93ee1
1 parent d22378e
commit 7f93ee1
Show file tree

Hide file tree

Showing 101 changed files with 153 additions and 122 deletions.
diff --git a/composer.json b/composer.json
@@ -9,11 +9,11 @@
     }
   ],
   "require": {
-    "php": ">=5.6.0",
+    "php": ">=7.4",
     "packaged/helpers": "^1.0||^2.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.8.0",
+    "phpunit/phpunit": "~8.0",
     "satooshi/php-coveralls": "~1.0.0"
   },
   "autoload": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -8,10 +8,9 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
   <testsuites>
-    <testsuite>
+    <testsuite name="tests">
       <directory>tests</directory>
     </testsuite>
   </testsuites>

diff --git a/src/Assembler/MySQL/MySQLAssembler.php b/src/Assembler/MySQL/MySQLAssembler.php
@@ -32,7 +32,7 @@ public function assembleField(FieldExpression $field)
     if($field->hasTable())
     {
       return $this->assembleTableExpression($field->getTable())
-      . '.' . $this->escapeField($field->getField());
+        . '.' . $this->escapeField($field->getField());
     }
     else
     {
@@ -42,6 +42,10 @@ public function assembleField(FieldExpression $field)
 
   public function assembleTableExpression(TableExpression $expr)
   {
+    if($expr->getDatabase())
+    {
+      return $this->escapeField($expr->getDatabase()) . '.' . $this->escapeField($expr->getTableName());
+    }
     return $this->escapeField($expr->getTableName());
   }
 

diff --git a/src/Assembler/QueryAssembler.php b/src/Assembler/QueryAssembler.php
@@ -169,6 +169,6 @@ public function escapeField($field)
 
   public function escapeValue($value)
   {
-    return '"' . addcslashes($value, '"') . '"';
+    return $value ? '"' . addcslashes($value, '"') . '"' : '""';
   }
 }
diff --git a/src/Expression/TableExpression.php b/src/Expression/TableExpression.php
@@ -4,6 +4,21 @@
 class TableExpression implements IExpression
 {
   protected $_table;
+  protected $_database;
+
+  /**
+   * @return string|null
+   */
+  public function getDatabase()
+  {
+    return $this->_database;
+  }
+
+  public function setDatabase($database)
+  {
+    $this->_database = $database;
+    return $this;
+  }
 
   public function setTableName($table)
   {
@@ -18,11 +33,12 @@ public function getTableName()
 
   /**
    * @param $table
+   * @param $database
    *
-   * @return static
+   * @return \Packaged\QueryBuilder\Expression\TableExpression
    */
-  public static function create($table)
+  public static function create($table, $database = null)
   {
-    return (new static)->setTableName($table);
+    return (new static())->setTableName($table)->setDatabase($database);
   }
 }
diff --git a/tests/Assembler/AssemblerTest.php b/tests/Assembler/AssemblerTest.php
@@ -14,8 +14,9 @@
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 use Packaged\QueryBuilder\Statement\IStatement;
 use Packaged\QueryBuilder\Statement\QueryStatement;
+use PHPUnit\Framework\TestCase;
 
-class AssemblerTest extends \PHPUnit_Framework_TestCase
+class AssemblerTest extends TestCase
 {
   /**
    * @expectedException \Exception
@@ -46,9 +47,9 @@ public function testAssemblerPrepare()
       [
         'AND' => [
           EqualPredicate::create('field2', null),
-          NotEqualPredicate::create('field3', null)
+          NotEqualPredicate::create('field3', null),
         ],
-        'OR'  => BetweenPredicate::create('field4', 123, 456)
+        'OR'  => BetweenPredicate::create('field4', 123, 456),
       ]
     );
     $assembler = new QueryAssembler($stm, true);
@@ -114,7 +115,7 @@ public function testInPredicate()
       )
     );
 
-    $this->setExpectedException(
+    $this->expectException(
       '\Packaged\QueryBuilder\Exceptions\Assembler\QueryBuilderAssemblerException',
       'Cannot assemble an empty ArrayExpression'
     );

diff --git a/tests/Assembler/CQL/CqlAssemblerTest.php b/tests/Assembler/CQL/CqlAssemblerTest.php
@@ -15,8 +15,9 @@
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\CountSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\FieldSelectExpression;
+use PHPUnit\Framework\TestCase;
 
-class CqlAssemblerTest extends \PHPUnit_Framework_TestCase
+class CqlAssemblerTest extends TestCase
 {
   public function testBetween()
   {

diff --git a/tests/Assembler/MySQL/MySQLAssemblerTest.php b/tests/Assembler/MySQL/MySQLAssemblerTest.php
@@ -11,8 +11,9 @@
 use Packaged\QueryBuilder\SelectExpression\MatchSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\MaxSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\SubQuerySelectExpression;
+use PHPUnit\Framework\TestCase;
 
-class MySQLAssemblerTest extends \PHPUnit_Framework_TestCase
+class MySQLAssemblerTest extends TestCase
 {
   public function testTableName()
   {
@@ -28,6 +29,12 @@ public function testTableName()
         TableExpression::create('mytable')
       )
     );
+    $this->assertEquals(
+      '`mydb`.`mytable`',
+      MySQLAssembler::stringify(
+        TableExpression::create('mytable', 'mydb')
+      )
+    );
   }
 
   public function testFieldName()

diff --git a/tests/Builder/Expect/QueryBuilderDeleteTest.php b/tests/Builder/Expect/QueryBuilderDeleteTest.php
@@ -3,8 +3,9 @@
 
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Builder\QueryBuilder;
+use PHPUnit\Framework\TestCase;
 
-class QueryBuilderDeleteTest extends \PHPUnit_Framework_TestCase
+class QueryBuilderDeleteTest extends TestCase
 {
   public function testDelete()
   {

diff --git a/tests/Builder/Expect/QueryBuilderSelectTest.php b/tests/Builder/Expect/QueryBuilderSelectTest.php
@@ -3,8 +3,9 @@
 
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Builder\QueryBuilder;
+use PHPUnit\Framework\TestCase;
 
-class QueryBuilderSelectTest extends \PHPUnit_Framework_TestCase
+class QueryBuilderSelectTest extends TestCase
 {
   public function testSelect()
   {

diff --git a/tests/Builder/Traits/GroupByTraitTest.php b/tests/Builder/Traits/GroupByTraitTest.php
@@ -5,8 +5,9 @@
 use Packaged\QueryBuilder\Builder\Traits\GroupByTrait;
 use Packaged\QueryBuilder\Clause\GroupByClause;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
+use PHPUnit\Framework\TestCase;
 
-class GroupByTraitTest extends \PHPUnit_Framework_TestCase
+class GroupByTraitTest extends TestCase
 {
   public function testCreate()
   {

diff --git a/tests/Builder/Traits/JoinTraitTest.php b/tests/Builder/Traits/JoinTraitTest.php
@@ -12,7 +12,7 @@
 use Packaged\QueryBuilder\SelectExpression\TableSelectExpression;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class JoinTraitTest extends \PHPUnit_Framework_TestCase
+class JoinTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testCreate()
   {

diff --git a/tests/Builder/Traits/LimitTraitTest.php b/tests/Builder/Traits/LimitTraitTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Builder\Traits\LimitTrait;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class LimitTraitTest extends \PHPUnit_Framework_TestCase
+class LimitTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testCreate()
   {

diff --git a/tests/Builder/Traits/OrderByTraitTest.php b/tests/Builder/Traits/OrderByTraitTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Clause\OrderByClause;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class OrderByTraitTest extends \PHPUnit_Framework_TestCase
+class OrderByTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testCreate()
   {

diff --git a/tests/Builder/Traits/TableTraitTest.php b/tests/Builder/Traits/TableTraitTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\SelectExpression\TableSelectExpression;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class TableTraitTest extends \PHPUnit_Framework_TestCase
+class TableTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testGetTable()
   {

diff --git a/tests/Builder/Traits/WhereTraitTest.php b/tests/Builder/Traits/WhereTraitTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Builder\Traits\WhereTrait;
 use Packaged\QueryBuilder\Statement\AbstractStatement;
 
-class WhereTraitTest extends \PHPUnit_Framework_TestCase
+class WhereTraitTest extends \PHPUnit\Framework\TestCase
 {
   public function testCreate()
   {
@@ -35,7 +35,7 @@ public function testCreate()
   public function testException()
   {
     $class = new FinalWhereTrait();
-    $this->setExpectedException(
+    $this->expectException(
       'RuntimeException',
       'You can only use andWhere and orWhere after specifying a where clause'
     );

diff --git a/tests/Clause/AbstractFieldClauseTest.php b/tests/Clause/AbstractFieldClauseTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Clause\AbstractFieldClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-class AbstractFieldClauseTest extends \PHPUnit_Framework_TestCase
+class AbstractFieldClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {

diff --git a/tests/Clause/AbstractPredicateClauseTest.php b/tests/Clause/AbstractPredicateClauseTest.php
@@ -7,13 +7,13 @@
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 use Packaged\QueryBuilder\Predicate\NotEqualPredicate;
 
-class AbstractPredicateClauseTest extends \PHPUnit_Framework_TestCase
+class AbstractPredicateClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testGettersAndSetters()
   {
     $clause = new FinalAbstractPredicateClause();
-    $eq     = new EqualPredicate();
-    $neq    = new NotEqualPredicate();
+    $eq = new EqualPredicate();
+    $neq = new NotEqualPredicate();
 
     $this->assertFalse($clause->hasPredicates());
     $clause->addPredicate($eq);
@@ -27,14 +27,14 @@ public function testGettersAndSetters()
     $clause->clearPredicates();
     $this->assertFalse($clause->hasPredicates());
 
-    $this->setExpectedException("InvalidArgumentException");
+    $this->expectException("InvalidArgumentException");
     $clause->setPredicates([$eq, $neq, 'abc']);
   }
 
   public function testAssemble()
   {
     $clause = new FinalAbstractPredicateClause();
-    $eq     = new EqualPredicate();
+    $eq = new EqualPredicate();
     $string = (new StringExpression())->setValue('val');
     $eq->setField('one')->setExpression($string);
     $neq = new NotEqualPredicate();

diff --git a/tests/Clause/AbstractTableClauseTest.php b/tests/Clause/AbstractTableClauseTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Clause\AbstractTableClause;
 use Packaged\QueryBuilder\Clause\IClause;
 
-class AbstractTableClauseTest extends \PHPUnit_Framework_TestCase
+class AbstractTableClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testGettersAndSetters()
   {
@@ -53,4 +53,4 @@ public function getAction()
   public function allowMultiple()
   {
   }
-}
+}
diff --git a/tests/Clause/DeleteClauseTest.php b/tests/Clause/DeleteClauseTest.php
@@ -4,7 +4,7 @@
 use Packaged\QueryBuilder\Assembler\QueryAssembler;
 use Packaged\QueryBuilder\Clause\DeleteClause;
 
-class DeleteClauseTest extends \PHPUnit_Framework_TestCase
+class DeleteClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {

diff --git a/tests/Clause/DuplicateKeyClauseTest.php b/tests/Clause/DuplicateKeyClauseTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\FieldExpression;
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 
-class DuplicateKeyClauseTest extends \PHPUnit_Framework_TestCase
+class DuplicateKeyClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testDuplicateKey()
   {

diff --git a/tests/Clause/FromClauseTest.php b/tests/Clause/FromClauseTest.php
@@ -7,7 +7,7 @@
 use Packaged\QueryBuilder\SelectExpression\CountSelectExpression;
 use Packaged\QueryBuilder\SelectExpression\SubQuerySelectExpression;
 
-class FromClauseTest extends \PHPUnit_Framework_TestCase
+class FromClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {

diff --git a/tests/Clause/GroupByClauseTest.php b/tests/Clause/GroupByClauseTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Clause\GroupByClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-class GroupByClauseTest extends \PHPUnit_Framework_TestCase
+class GroupByClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {

diff --git a/tests/Clause/HavingClauseTest.php b/tests/Clause/HavingClauseTest.php
@@ -8,7 +8,7 @@
 use Packaged\QueryBuilder\Predicate\EqualPredicate;
 use Packaged\QueryBuilder\Predicate\GreaterThanPredicate;
 
-class HavingClauseTest extends \PHPUnit_Framework_TestCase
+class HavingClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {

diff --git a/tests/Clause/InsertClauseTest.php b/tests/Clause/InsertClauseTest.php
@@ -5,7 +5,7 @@
 use Packaged\QueryBuilder\Clause\InsertClause;
 use Packaged\QueryBuilder\Expression\FieldExpression;
 
-class InsertClauseTest extends \PHPUnit_Framework_TestCase
+class InsertClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {
@@ -43,7 +43,7 @@ public function testGettersAndSetters()
     $clause->clearFields();
     $this->assertFalse($clause->hasFields());
 
-    $this->setExpectedException("InvalidArgumentException");
+    $this->expectException("InvalidArgumentException");
     $clause->setFields([$nameField, $idField, 'abc']);
   }
 }
diff --git a/tests/Clause/LimitClauseTest.php b/tests/Clause/LimitClauseTest.php
@@ -7,7 +7,7 @@
 use Packaged\QueryBuilder\Expression\NumericExpression;
 use Packaged\QueryBuilder\SelectExpression\AllSelectExpression;
 
-class LimitClauseTest extends \PHPUnit_Framework_TestCase
+class LimitClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {

diff --git a/tests/Clause/OrderByClauseTest.php b/tests/Clause/OrderByClauseTest.php
@@ -6,7 +6,7 @@
 use Packaged\QueryBuilder\Expression\FieldExpression;
 use Packaged\QueryBuilder\SelectExpression\CustomSelectExpression;
 
-class OrderByClauseTest extends \PHPUnit_Framework_TestCase
+class OrderByClauseTest extends \PHPUnit\Framework\TestCase
 {
   public function testAssemble()
   {