[fix] equal operator for columns relationship #1014.

catfan · Sep 17, 2021 · 6f9a6c6 · 6f9a6c6
1 parent 96c66ae
commit 6f9a6c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Medoo.php b/src/Medoo.php
@@ -856,7 +856,7 @@ protected function dataImplode(array $data, array &$map, string $conjunctor): st
             $isIndex = is_int($key);
 
             preg_match(
-                '/([\p{L}_][\p{L}\p{N}@$#\-_\.]*)(\[(?<operator>\>\=?|\<\=?|\!|\<\>|\>\<|\!?~|REGEXP)\])?([\p{L}_][\p{L}\p{N}@$#\-_\.]*)?/u',
+                '/([\p{L}_][\p{L}\p{N}@$#\-_\.]*)(\[(?<operator>\>\=?|\<\=?|\=|\!\=?|\<\>|\>\<|\!?~|REGEXP)\])?([\p{L}_][\p{L}\p{N}@$#\-_\.]*)?/u',
                 $isIndex ? $value : $key,
                 $match
             );

diff --git a/tests/WhereTest.php b/tests/WhereTest.php
@@ -435,7 +435,8 @@ public function testColumnsRelationshipWhere($type)
         ], [
             "post.content"
         ], [
-            "post.restrict[<]account.age"
+            "post.restrict[<]account.age",
+            "post.type[=]account.type"
         ]);
 
         $this->assertQuery(
@@ -444,7 +445,9 @@ public function testColumnsRelationshipWhere($type)
             FROM "post"
             LEFT JOIN "account"
             USING ("user_id")
-            WHERE "post"."restrict" < "account"."age"
+            WHERE
+            "post"."restrict" < "account"."age" AND
+            "post"."type" = "account"."type"
             EOD,
             $this->database->queryString
         );