Fix bug in decodeJson() function (#113)

amphp · Dec 1, 2021 · d0b9a61 · d0b9a61
1 parent 4293060
commit d0b9a61
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/DataTypes.php b/src/DataTypes.php
@@ -240,7 +240,7 @@ public static function decodeStringOff(int $type, string $str, int &$off) /* : m
 
     private static function decodeJson(string $data): string
     {
-        if (!\strncmp(self::ENCODED_JSON_PREFIX, $data, \strlen(self::ENCODED_JSON_PREFIX))) {
+        if (\strncmp(self::ENCODED_JSON_PREFIX, $data, \strlen(self::ENCODED_JSON_PREFIX)) !== 0) {
             return $data; // Data was not base-64 encoded.
         }
 

diff --git a/test/LinkTest.php b/test/LinkTest.php
@@ -364,4 +364,17 @@ public function testInsertSelect()
             yield $transaction->rollback();
         }
     }
+
+    public function testJsonDecoding()
+    {
+        /** @var Link $db */
+        $db = yield $this->getLink("host=".DB_HOST.";user=".DB_USER.";pass=".DB_PASS.";db=test");
+
+        /** @var ResultSet $resultset */
+        $resultset = yield $db->execute("SELECT a FROM test.json");
+        $this->assertInstanceOf(ResultSet::class, $resultset);
+
+        yield $resultset->advance();
+        $this->assertSame(["a" => '{"key": "value"}'], $resultset->getCurrent());
+    }
 }
diff --git a/test/bootstrap.php b/test/bootstrap.php
@@ -78,6 +78,8 @@
     $db->query("CREATE DATABASE test");
     $db->query("CREATE TABLE test.main (a INT(11), b INT(11))");
     $db->query("INSERT INTO test.main VALUES (1, 2), (2, 3), (3, 4), (4, 5), (5, 6)");
+    $db->query("CREATE TABLE test.json (a JSON)");
+    $db->query("INSERT INTO test.json VALUES ('{\"key\": \"value\"}')");
     $db->close();
 
     print "\r";