Remove old logic

Author: fogelito

src/Database/Adapter/Postgres.php

@@ -1504,11 +1504,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
         try {
             $stmt = $this->getPDO()->prepare($sql);
             foreach ($binds as $key => $value) {
-                if ($key === ":sequence") {
-                    $stmt->bindValue($key, $value, PDO::PARAM_INT);
-                } else {
-                    $stmt->bindValue($key, $value, $this->getPDOType($value));
-                }
+                $stmt->bindValue($key, $value, $this->getPDOType($value));
             }
 
             $this->execute($stmt);
@@ -1768,14 +1764,9 @@ protected function getSQLCondition(Query $query, array &$binds): string
                         Query::TYPE_CONTAINS => $query->onArray() ? \json_encode($value) : '%' . $this->escapeWildcards($value) . '%',
                         default => $value
                     };
-                    if ($attribute === $this->quote("_id")) {
-                        $binds[":sequence"] = $value;
-                        $conditions[] = "{$alias}.{$attribute} {$operator} :sequence";
-                    } else {
-                        $binds[":{$placeholder}_{$key}"] = $value;
-                        $conditions[] = "{$alias}.{$attribute} {$operator} :{$placeholder}_{$key}";
-                    }
 
+                    $binds[":{$placeholder}_{$key}"] = $value;
+                    $conditions[] = "{$alias}.{$attribute} {$operator} :{$placeholder}_{$key}";
                 }
 
                 return empty($conditions) ? '' : '(' . implode(' OR ', $conditions) . ')';

src/Database/Database.php

@@ -6673,8 +6673,22 @@ public static function convertQueries(Document $collection, array $queries): arr
         }
 
         foreach ($attributes as $attribute) {
-            foreach ($queries as $query) {
+            foreach ($queries as $index => $query) {
                 if ($query->getAttribute() === $attribute->getId()) {
+                    if($query->getAttribute() === '$sequence'){
+                        /**
+                         * Hack for Postgres, since bindParam does not convert '' on int attribute
+                         */
+                        $values = $query->getValues();
+                        foreach ($values as $valueIndex => $value) {
+                            if($value === ''){
+                                $values[$valueIndex] = '0';
+                            }
+                        }
+                        $query->setValues($values);
+                        $queries[$index] = $query;
+                    }
+
                     $query->setOnArray($attribute->getAttribute('array', false));
                 }
             }

tests/e2e/Adapter/Scopes/DocumentTests.php

@@ -1778,8 +1778,21 @@ public function testFindByInternalID(array $data): void
         $documents = $database->find('movies', [
             Query::equal('$sequence', [$data['$sequence']]),
         ]);
-
         $this->assertEquals(1, count($documents));
+
+        /**
+         * Test getSequence returns '' Postgres bindParam issue on empty string
+         * Hack in convertQueries to change $sequence empty string from '' => '0'
+         * We should not use this fix and use structure validations, or change using not querying on empty string
+         */
+        $empty = new Document();
+
+        /**
+         * Check no exceptions are thrown as a temporary fix
+         */
+        $database->find('movies', [
+            Query::equal('$sequence', [$empty->getSequence()]),
+        ]);
     }
 
     public function testFindOrderBy(): void