CrateDB bulk operations: Remove CRATE_ATTR_BULK_MODE attribute again

Going modeless is better anyway, and mitigates corresponding ux flaws.

Author: amotl

src/Crate/PDO/PDO.php

@@ -42,7 +42,6 @@ class PDO extends BasePDO implements PDOInterface
 
     public const CRATE_ATTR_HTTP_BASIC_AUTH = 1000;
     public const CRATE_ATTR_DEFAULT_SCHEMA  = 1001;
-    public const CRATE_ATTR_BULK_MODE       = 1009;
 
     public const CRATE_ATTR_SSL_MODE                                       = 1008;
     public const CRATE_ATTR_SSL_MODE_DISABLED                              = 1;
@@ -127,7 +126,7 @@ public function __construct($dsn, $username = null, $passwd = null, $options = [
             $this->lastStatement = $statement;
 
             try {
-                if ($this->getAttribute(self::CRATE_ATTR_BULK_MODE)) {
+                if ($statement->isBulkMode()) {
                     return $this->server->executeBulk($sql, $parameters);
                 } else {
                     return $this->server->execute($sql, $parameters);
@@ -328,10 +327,6 @@ public function setAttribute($attribute, $value)
                 $this->attributes['defaultSchema'] = $value;
                 break;
 
-            case self::CRATE_ATTR_BULK_MODE:
-                $this->attributes['bulkMode'] = $value;
-                break;
-
             case self::CRATE_ATTR_SSL_MODE:
                 $this->attributes['sslMode'] = $value;
                 break;
@@ -412,9 +407,6 @@ public function getAttribute($attribute)
             case self::CRATE_ATTR_DEFAULT_SCHEMA:
                 return $this->attributes['defaultSchema'];
 
-            case self::CRATE_ATTR_BULK_MODE:
-                return $this->attributes['bulkMode'];
-
             case self::CRATE_ATTR_SSL_MODE:
                 return $this->attributes['sslMode'];
 

src/Crate/PDO/PDOStatement.php

@@ -103,9 +103,6 @@ public function __construct(PDOInterface $pdo, Closure $request, $sql, array $op
         $this->pdo     = $pdo;
         $this->options = array_merge($this->options, $options);
         $this->request = $request;
-
-        // Storing `bulkMode` flag because calling `pdo->getAttribute()` at runtime reveals weird errors.
-        $this->options["bulkMode"] = $this->pdo->getAttribute(PDO::CRATE_ATTR_BULK_MODE);
     }
 
     private function replaceNamedParametersWithPositionals($sql)
@@ -698,4 +695,9 @@ private function getObjectResult(array $columns, array $row)
 
         return $obj;
     }
+
+    public function isBulkMode()
+    {
+        return $this->options["bulkMode"];
+    }
 }

test/CrateIntegrationTest/PDO/PDOStatementTest.php

@@ -355,13 +355,12 @@ public function testInsertNull()
     public function testInsertBulk()
     {
         // Insert records in bulk mode.
-        $this->pdo->setAttribute(PDO::CRATE_ATTR_BULK_MODE, true);
         $parameters = [[5, 'foo', 1], [6, 'bar', 2], [7, 'foo', 3], [8, 'bar', 4]];
-        $statement = $this->pdo->prepare('INSERT INTO test_table (id, name, int_type) VALUES (?, ?, ?)');
+        $statement = $this->pdo->prepare('INSERT INTO test_table (id, name, int_type) VALUES (?, ?, ?)', array("bulkMode" => true));
+        $retval = $statement->execute($parameters);
         $this->assertTrue($statement->execute($parameters));
 
         // Verify records have been inserted correctly.
-        $this->pdo->setAttribute(PDO::CRATE_ATTR_BULK_MODE, false);
         $this->pdo->exec("REFRESH TABLE test_table");
         $statement = $this->pdo->prepare("SELECT id, name, int_type FROM test_table");
         $results = $statement->fetchAll(PDO::FETCH_NUM);

test/CrateTest/PDO/Http/ServerPoolTest.php

@@ -209,36 +209,14 @@ public function testGuzzleClientOptionTest(array $options, array $expected)
 
     }
 
-    public function pdoOptionsBulk()
-    {
-        return [
-            [
-                [
-                    PDO::CRATE_ATTR_BULK_MODE => true,
-                ],
-                [
-                    'base_uri'             => 'http://localhost:4200',
-                ],
-            ],
-        ];
-    }
-
     /**
      * Verify Guzzle client behavior when using CrateDB bulk operations.
      * https://crate.io/docs/crate/reference/en/latest/interfaces/http.html#bulk-operations
      *
-     * @dataProvider pdoOptionsBulk
-     *
-     * @param array $options
-     * @param array $expected
      */
-    public function testGuzzleClientOptionTestBulkMode(array $options, array $expected)
+    public function testGuzzleClientOptionTestBulkMode()
     {
-        foreach ($options as $attr => $val) {
-            $this->pdo->setAttribute($attr, $val);
-        }
-
-        $expectedWithDefaults = array_merge([
+        $expectedWithDefaults = [
             RequestOptions::TIMEOUT         => 0.0,
             RequestOptions::CONNECT_TIMEOUT => 0.0,
             RequestOptions::JSON            => [
@@ -252,7 +230,7 @@ public function testGuzzleClientOptionTestBulkMode(array $options, array $expect
 
             RequestOptions::AUTH => null,
             'base_uri'           => 'http://localhost:4200',
-        ], $expected);
+        ];
 
         $body = json_encode(['results' => [["foo", "bar"]], 'cols' => [], 'duration' => 0]);
 

test/CrateTest/PDO/PDOTest.php

@@ -356,20 +356,6 @@ public function fetchModeStyleProvider()
         ];
     }
 
-    /**
-     * Verify support for CrateDB bulk operations.
-     * https://crate.io/docs/crate/reference/en/latest/interfaces/http.html#bulk-operations
-     *
-     * @covers ::getAttribute
-     * @covers ::setAttribute
-     */
-    public function testGetAndSetBulkMode()
-    {
-        $this->assertEquals(false, $this->pdo->getAttribute(PDO::CRATE_ATTR_BULK_MODE));
-        $this->pdo->setAttribute(PDO::CRATE_ATTR_BULK_MODE, true);
-        $this->assertEquals(true, $this->pdo->getAttribute(PDO::CRATE_ATTR_BULK_MODE));
-    }
-
     /**
      * Verify support for CrateDB bulk operations.
      * https://crate.io/docs/crate/reference/en/latest/interfaces/http.html#bulk-operations
@@ -378,8 +364,7 @@ public function testGetAndSetBulkMode()
      */
     public function testBulkMode()
     {
-        $this->pdo->setAttribute(PDO::CRATE_ATTR_BULK_MODE, true);
-        $statement = $this->pdo->query("INSERT INTO foobar;", null, [["foo", "bar"]]);
+        $statement = $this->pdo->prepare("INSERT INTO foobar;", array("bulkMode" => true));
 
         // Enable accessing the private `options` property of the `PDOStatement` instance.
         $class = new ReflectionClass($statement);