v.1.1.11 Fixed the error caused by PDO parameters in IN where statement.

muhammetsafak · muhammetsafak · commit 66245ca06cfc · 2022-08-09T09:16:35.000+03:00
diff --git a/src/Connection/Connection.php b/src/Connection/Connection.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Connection/ConnectionInterface.php b/src/Connection/ConnectionInterface.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/DB.php b/src/DB.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/DataMapper/DataMapper.php b/src/DataMapper/DataMapper.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/DataMapper/DataMapperInterface.php b/src/DataMapper/DataMapperInterface.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Entity.php b/src/Entity.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DataMapperException.php b/src/Exceptions/DataMapperException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DataMapperInvalidArgumentException.php b/src/Exceptions/DataMapperInvalidArgumentException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DatabaseConnectionException.php b/src/Exceptions/DatabaseConnectionException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DatabaseException.php b/src/Exceptions/DatabaseException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/DatabaseInvalidArgumentException.php b/src/Exceptions/DatabaseInvalidArgumentException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ModelCallbacksException.php b/src/Exceptions/ModelCallbacksException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ModelException.php b/src/Exceptions/ModelException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ModelPermissionException.php b/src/Exceptions/ModelPermissionException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ModelRelationsException.php b/src/Exceptions/ModelRelationsException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/QueryBuilderException.php b/src/Exceptions/QueryBuilderException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/QueryBuilderInvalidArgumentException.php b/src/Exceptions/QueryBuilderInvalidArgumentException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Exceptions/ValidationException.php b/src/Exceptions/ValidationException.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Helper.php b/src/Helper.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/Model.php b/src/Model.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/From.php b/src/QueryBuilder/Expressions/From.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/GroupBy.php b/src/QueryBuilder/Expressions/GroupBy.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/Join.php b/src/QueryBuilder/Expressions/Join.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/Limit.php b/src/QueryBuilder/Expressions/Limit.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/OrderBy.php b/src/QueryBuilder/Expressions/OrderBy.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/Select.php b/src/QueryBuilder/Expressions/Select.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/Expressions/WhereAndHaving.php b/src/QueryBuilder/Expressions/WhereAndHaving.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
@@ -585,36 +585,57 @@ private function whereOrHavingStatementPrepare(string $column, $value, string $m
                 if(Helper::isSQLParameterOrFunction($end) === FALSE){
                     $end = $this->db->getDataMapper()->addParameter($column . '_end', $end);
                 }
-
                 return $column . ' '
                     . ($searchMark === 'NOTBETWEEN' ? 'NOT ':'')
                     . 'BETWEEN ' . $start . ' AND ' . $end;
             case 'IN':
+            case 'NOTIN':
                 if(\is_array($value)){
+                    $values = [];
+                    foreach ($value as $key => $val) {
+                        if(\is_numeric($val)){
+                            $values[] = $this->db->getDataMapper()->addParameter(($column . $key), $val);
+                            continue;
+                        }
+                        if(\is_string($val)){
+                            if(Helper::isSQLParameterOrFunction($val)){
+                                $values[] = $val;
+                            }else{
+                                $values[] = $this->db->getDataMapper()->addParameter(($column . $key), $val);
+                            }
+                            continue;
+                        }
+                        throw new QueryBuilderInvalidArgumentException('Only integers or a string of strings can be used for IN.');
+                    }
+                    $value = \implode(', ', $values);
+                }elseif(\is_string($value) || \is_numeric($value)) {
+                    if(Helper::isSQLParameterOrFunction($value) === FALSE){
+                        $value = $this->db->getDataMapper()->addParameter($column, \trim($value, '()'));
+                    }
+                }else{
+                    throw new QueryBuilderInvalidArgumentException('Only integers or a string of strings can be used for IN.');
+                }
+                return $column
+                    . ($searchMark === 'NOTIN' ? ' NOT ' : ' ')
+                    . 'IN (' . $value . ')';
+            case 'FINDINSET':
+            case 'NOTFINDINSET':
+                if(is_array($value)){
                     $value = \implode(', ', $value);
                 }
                 if(Helper::isSQLParameterOrFunction($value) === FALSE){
-                    $value = $this->db->getDataMapper()->addParameter($column, '(' . $value . ')');
+                    $value = $this->db->getDataMapper()->addParameter($column, $value);
                 }
-                return $column . ' IN ' . $value;
-            case 'NOTIN':
-                if(\is_array($value)){
-                    $value = \implode(', ', $value);
+                return ($searchMark === 'NOTFINDINSET' ? 'NOT ':'')
+                    . 'FIND_IN_SET(' . $value . ', ' . $column . ')';
+            case 'SOUNDEX':
+                if(!\is_string($value)){
+                    throw new QueryBuilderInvalidArgumentException('Only a string value can be defined for Soundex.');
                 }
                 if(Helper::isSQLParameterOrFunction($value) === FALSE){
-                    $value = $this->db->getDataMapper()->addParameter($column, '(' . $value . ')');
+                    $value = $this->db->getDataMapper()->addParameter($column, $value);
                 }
-                return $column . ' NOT IN ' . $value;
-            case 'FINDINSET':
-                return 'FIND_IN_SET('
-                . \is_array($value) ? "'" . \implode(', ', $value) . "'" : Helper::queryBindParameter($value, '{value}')
-                    . ', ' . $column . ')';
-            case 'NOTFINDINSET':
-                return 'NOT FIND_IN_SET('
-                . \is_array($value) ? "'" . \implode(', ', $value) . "'" : Helper::queryBindParameter($value, '{value}')
-                    . ', ' . $column . ')';
-            case 'SOUNDEX':
-                return "SOUNDEX(" . $column . ") LIKE CONCAT('%', TRIM(TRAILING '0' FROM SOUNDEX(" . Helper::queryBindParameter($value, '{value}') . ")), '%')";
+                return "SOUNDEX(" . $column . ") LIKE CONCAT('%', TRIM(TRAILING '0' FROM SOUNDEX(" . $value . ")), '%')";
         }
 
         if(((bool)\preg_match('/([\w_]+)\((.+)\)$/iu', $column, $matches)) !== FALSE){
diff --git a/src/QueryBuilder/QueryBuilder.php b/src/QueryBuilder/QueryBuilder.php
@@ -7,7 +7,7 @@
  * @author     Muhammet ŞAFAK <info@muhammetsafak.com.tr>
  * @copyright  Copyright © 2022 Muhammet ŞAFAK
  * @license    ./LICENSE  MIT
- * @version    1.1.10
+ * @version    1.1.11
  * @link       https://www.muhammetsafak.com.tr
  */
 
diff --git a/src/QueryBuilder/QueryBuilderInterface.php b/src/QueryBuilder/QueryBuilderInterface.php
diff --git a/src/Validation/Validation.php b/src/Validation/Validation.php
diff --git a/src/Validation/ValidationRulesTrait.php b/src/Validation/ValidationRulesTrait.php
