Fix mismatched signature for spatial index in Laravel (#104)

Changed spatialIndex to handle a different number of parameters.
Fixed JSON IS NULL and JSON IS NOT NULL functions (in newer versions of the database charset changed, and string comparison became case sensitive).

Author: AdalbertMemSQL

src/Query/SingleStoreQueryGrammar.php

@@ -146,7 +146,7 @@ protected function whereNull(Builder $query, $where)
         if ($this->isJsonSelector($columnValue)) {
             [$field, $path] = $this->wrapJsonFieldAndPath($where['column']);
 
-            return '(JSON_EXTRACT_JSON('.$field.$path.') IS NULL OR JSON_GET_TYPE(JSON_EXTRACT_JSON('.$field.$path.')) = \'NULL\')';
+            return '(JSON_EXTRACT_JSON('.$field.$path.') IS NULL OR JSON_GET_TYPE(JSON_EXTRACT_JSON('.$field.$path.')) = \'null\')';
         }
 
         return $this->wrap($where['column']).' is null';
@@ -158,7 +158,7 @@ protected function whereNotNull(Builder $query, $where)
         if ($this->isJsonSelector($columnValue)) {
             [$field, $path] = $this->wrapJsonFieldAndPath($where['column']);
 
-            return '(JSON_EXTRACT_JSON('.$field.$path.') IS NOT NULL AND JSON_GET_TYPE(JSON_EXTRACT_JSON('.$field.$path.')) != \'NULL\')';
+            return '(JSON_EXTRACT_JSON('.$field.$path.') IS NOT NULL AND JSON_GET_TYPE(JSON_EXTRACT_JSON('.$field.$path.')) != \'null\')';
         }
 
         return $this->wrap($where['column']).' is not null';

src/Schema/Blueprint/ModifiesIndexes.php

@@ -28,9 +28,19 @@ public function sortKey($columns = null, $direction = 'asc')
     /**
      * @return SpatialIndexCommand
      */
-    public function spatialIndex($columns, $name = null)
+    public function spatialIndex(...$args)
     {
-        parent::spatialIndex($columns, $name);
+        $columns = $args[0] ?? null;
+        $name = $args[1] ?? null;
+        $operatorClass = $args[2] ?? null;
+
+        // Laravel 12.21.0+ passes: $columns, $name = null, $operatorClass = null
+        // Laravel <12.21.0 passes: $columns, $name = null
+        if ((new \ReflectionMethod(parent::class, 'spatialIndex'))->getNumberOfParameters() === 3) {
+            return parent::spatialIndex($columns, $name, $operatorClass);
+        } else {
+            return parent::spatialIndex($columns, $name);
+        }
 
         return $this->recastLastCommand(SpatialIndexCommand::class);
     }

tests/Hybrid/HybridTestHelpers.php

@@ -48,6 +48,8 @@ protected function mockedConnection()
         $connection->shouldReceive('getSchemaGrammar')->andReturn($grammar);
         $connection->shouldReceive('getTablePrefix')->andReturn('');
         $connection->shouldReceive('getSchemaBuilder')->andReturn(new SingleStoreSchemaBuilder($connection));
+        $connection->allows('isMaria')->andReturn(false);
+        $connection->allows('getServerVersion')->andReturn('8.9.0');
 
         return $connection;
     }

tests/Hybrid/Json/JsonWhereTest.php

@@ -110,7 +110,7 @@ public function where_null()
 
         $this->assertEquals(
             // @TODO check docs
-            "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') IS NULL OR JSON_GET_TYPE(JSON_EXTRACT_JSON(data, 'value1')) = 'NULL') order by `id` asc",
+            "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') IS NULL OR JSON_GET_TYPE(JSON_EXTRACT_JSON(data, 'value1')) = 'null') order by `id` asc",
             $query->toSql()
         );
 
@@ -163,7 +163,7 @@ public function where_not_null()
 
         $this->assertEquals(
             // @TODO check docs
-            "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') IS NOT NULL AND JSON_GET_TYPE(JSON_EXTRACT_JSON(data, 'value1')) != 'NULL') order by `id` asc",
+            "select * from `test` where (JSON_EXTRACT_JSON(data, 'value1') IS NOT NULL AND JSON_GET_TYPE(JSON_EXTRACT_JSON(data, 'value1')) != 'null') order by `id` asc",
             $query->toSql()
         );