adding some tests, fixing devcontainer

Author: Carl Sverre

.devcontainer/Dockerfile

@@ -1,22 +1,6 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.231.6/containers/php/.devcontainer/base.Dockerfile
-
-# [Choice] PHP version (use -bullseye variants on local arm64/Apple Silicon): 8, 8.1, 8.0, 7, 7.4, 7.3, 8-bullseye, 8.1-bullseye, 8.0-bullseye, 7-bullseye, 7.4-bullseye, 7.3-bullseye, 8-buster, 8.1-buster, 8.0-buster, 7-buster, 7.4-buster
-ARG VARIANT="8.1-apache-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/php:0-${VARIANT}
-
-# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="none"
-RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+ARG VARIANT="0-8"
+FROM mcr.microsoft.com/devcontainers/php:${VARIANT}
 
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-RUN chmod +x /usr/local/bin/install-php-extensions && \
-    install-php-extensions gd xdebug
-
-RUN install-php-extensions pdo_mysql
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-# [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
+RUN chmod +x /usr/local/bin/install-php-extensions
+RUN install-php-extensions pdo_mysql

.devcontainer/devcontainer.json

@@ -8,29 +8,27 @@
       // Update VARIANT to pick a PHP version: 8, 8.1, 8.0, 7, 7.4
       // Append -bullseye or -buster to pin to an OS version.
       // Use -bullseye variants on local on arm64/Apple Silicon.
-      "VARIANT": "8",
-      "NODE_VERSION": "lts/*"
+      "VARIANT": "8"
     }
   },
 
   // Set *default* container specific settings.json values on container create.
-  "settings": {
-    "php.validate.executablePath": "/usr/local/bin/php"
-  },
-
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": [
-    "xdebug.php-debug",
-    "bmewburn.vscode-intelephense-client",
-    "emallin.phpunit"
-  ],
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "php.validate.executablePath": "/usr/local/bin/php"
+      },
 
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  "forwardPorts": [8080],
+      // Add the IDs of extensions you want installed when the container is created.
+      "extensions": [
+        "xdebug.php-debug",
+        "bmewburn.vscode-intelephense-client",
+        "emallin.phpunit"
+      ]
+    }
+  },
 
   // Use 'postCreateCommand' to run commands after the container is created.
   "postCreateCommand": "composer install",
-
-  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-  "remoteUser": "vscode"
+  "forwardPorts": []
 }

tests/Hybrid/CreateTable/MiscCreateTest.php

@@ -73,4 +73,18 @@ public function discussion_53()
             'create table `test` (`id` bigint unsigned not null auto_increment, `user_id` bigint unsigned not null, `template_id` varchar(255) not null, `data` longtext not null, `response_status_code` varchar(255) not null, `response_message` longtext not null, `created_at` timestamp null, `updated_at` timestamp null, index `test_id_index`(`id`), shard key(`user_id`))'
         );
     }
+
+    /** @test */
+    public function json_column()
+    {
+        $blueprint = $this->createTable(function (Blueprint $table) {
+            $table->id();
+            $table->json('data');
+        });
+
+        $this->assertCreateStatement(
+            $blueprint,
+            'create table `test` (`id` bigint unsigned not null auto_increment primary key, `data` json not null)'
+        );
+    }
 }

tests/Hybrid/Json/JsonWhereTest.php

@@ -31,7 +31,7 @@ public function singlestore_will_cast_all_types()
         $query3 = DB::table('test')->where('data->value1->value2', 1.5);
         $query4 = DB::table('test')->where('data->value1->value2', json_encode(['a' => 'b']));
 
-        if (! $this->runHybridIntegrations()) {
+        if (!$this->runHybridIntegrations()) {
             return;
         }
 
@@ -71,7 +71,7 @@ public function json_boolean()
             $query2->toSql()
         );
 
-        if (! $this->runHybridIntegrations()) {
+        if (!$this->runHybridIntegrations()) {
             return;
         }
 
@@ -105,15 +105,15 @@ public function nested_where()
     /** @test */
     public function where_null()
     {
-        $query = DB::table('test')->whereNull('data->value1');
+        $query = DB::table('test')->whereNull('data->value1')->orderBy('id');
 
         $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')",
+            "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()
         );
 
-        if (! $this->runHybridIntegrations()) {
+        if (!$this->runHybridIntegrations()) {
             return;
         }
 
@@ -139,11 +139,11 @@ public function where_not_null()
             $query->toSql()
         );
 
-        if (! $this->runHybridIntegrations()) {
+        if (!$this->runHybridIntegrations()) {
             return;
         }
 
-        [$id1, , , $id4] = $this->insertJsonData([
+        [$id1,,, $id4] = $this->insertJsonData([
             ['value1' => ['value2' => 'string']],
             ['value1' => null],
             [null],

tests/Hybrid/TransactionsTest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace SingleStore\Laravel\Tests\Hybrid;
+
+use Illuminate\Support\Facades\DB;
+use SingleStore\Laravel\Schema\Blueprint;
+use SingleStore\Laravel\Tests\BaseTest;
+
+class TransactionsTest extends BaseTest
+{
+    use HybridTestHelpers;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        if ($this->runHybridIntegrations()) {
+            $this->createTable(function (Blueprint $table) {
+                $table->id();
+            });
+        }
+    }
+
+    /** @test */
+    public function multipleBegin()
+    {
+        if (!$this->runHybridIntegrations()) {
+            return;
+        }
+
+        DB::beginTransaction();
+        DB::rollBack();
+        DB::insert('select 1');
+        DB::beginTransaction();
+        DB::rollBack();
+    }
+}