chillerlan · Aug 27, 2024 · cad000f · cad000f
1 parent 871bfee
commit cad000f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/src/Query/BindValues.php b/src/Query/BindValues.php
@@ -11,7 +11,7 @@
 
 namespace chillerlan\Database\Query;
 
-interface BindValues{
+interface BindValues extends Statement{
 
 	public function getBindValues():array;
 

diff --git a/src/Query/CachedQuery.php b/src/Query/CachedQuery.php
@@ -11,7 +11,7 @@
 
 namespace chillerlan\Database\Query;
 
-interface CachedQuery{
+interface CachedQuery extends Query{
 
 	public function cached(int|null $ttl = null):static;
 

diff --git a/src/Query/Query.php b/src/Query/Query.php
@@ -11,9 +11,7 @@
 
 namespace chillerlan\Database\Query;
 
-interface Query{
-
-	public function getSQL(bool|null $multi = null):string;
+interface Query extends Statement{
 
 	/**
 	 * @throws \chillerlan\Database\Query\QueryException

diff --git a/src/Query/Select.php b/src/Query/Select.php
@@ -21,7 +21,7 @@
  * @link https://www.firebirdsql.org/file/documentation/reference_manuals/fblangref25-en/html/fblangref25-dml-select.html
  * @link https://www.sqlite.org/lang_select.html
  */
-class Select extends StatementAbstract implements Where, Limit, BindValues, Query, CachedQuery{
+class Select extends StatementAbstract implements Where, Limit, BindValues, CachedQuery{
 
 	protected bool  $distinct = false;
 	protected array $cols     = [];
@@ -104,7 +104,7 @@ public function count():int{
 		$sql    = $this->dialect->selectCount($this->from, $this->getWhere(), $this->distinct, $this->groupby);
 		$result = $this->db->prepared(implode(' ', $sql), $this->bindValues);
 
-		if($result instanceof ResultInterface && $result->count() > 0){
+		if($result->count() > 0){
 			return (int)$result[0]->count;
 		}
 

diff --git a/src/Query/Statement.php b/src/Query/Statement.php
@@ -23,4 +23,6 @@ interface Statement{
 	 */
 	public function setLogger(LoggerInterface $logger):static;
 
+	public function getSQL(bool|null $multi = null):string;
+
 }
diff --git a/src/Query/Update.php b/src/Query/Update.php
@@ -61,7 +61,7 @@ public function set(array $set, bool|null $bind = null):static{
 
 		foreach($set as $k => $v){
 
-			if($v instanceof Query){
+			if($v instanceof Statement){
 				$this->set[] = $this->dialect->quote($k).' = ('.$v->getSQL().')';
 
 				if($v instanceof BindValues){
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,4 +23,6 @@ interface Statement{ @@
     	 */
     	public function setLogger(LoggerInterface $logger):static;
+    	public function getSQL(bool|null $multi = null):string;
     }