Merge pull request #133 from auraphp/3.x-subselect-interface

Remove SubSelect interface, typehint on SelectInterface instead
auraphp · Mar 22, 2017 · 3be4c85 · 3be4c85
2 parents 8ab9f25 + 91a734d
commit 3be4c85
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 42 deletions.
diff --git a/src/AbstractQuery.php b/src/AbstractQuery.php
@@ -8,7 +8,7 @@
  */
 namespace Aura\SqlQuery;
 
-use Aura\SqlQuery\Common\SubselectInterface;
+use Aura\SqlQuery\Common\SelectInterface;
 use Aura\SqlQuery\Common\QuoterInterface;
 
 /**
@@ -350,7 +350,7 @@ protected function rebuildCondAndBindValues($cond, array $bind_values)
             }
 
             $bind_value = array_shift($bind_values);
-            if ($bind_value instanceof SubselectInterface) {
+            if ($bind_value instanceof SelectInterface) {
                 $parts[$key] = $bind_value->getStatement();
                 $this->bind_values = array_merge(
                     $this->bind_values,

diff --git a/src/Common/Select.php b/src/Common/Select.php
@@ -18,7 +18,7 @@
  * @package Aura.SqlQuery
  *
  */
-class Select extends AbstractQuery implements SelectInterface, SubselectInterface
+class Select extends AbstractQuery implements SelectInterface
 {
     use WhereTrait;
     use LimitOffsetTrait { limit as setLimit; offset as setOffset; }

diff --git a/src/Common/SubselectInterface.php b/src/Common/SubselectInterface.php