Merge 0c31b00 into ee96dd6

src/Load/DatabaseLoader/AbstractBatchStmt.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Author: Courtney Miles
+ * Date: 26/08/18
+ * Time: 9:07 AM
+ */
+
+namespace MilesAsylum\Slurp\Load\DatabaseLoader;
+
+use MilesAsylum\Slurp\Load\DatabaseLoader\Exception\MissingValueException;
+
+abstract class AbstractBatchStmt implements BatchStmtInterface
+{
+    /**
+     * @var \PDO
+     */
+    protected $pdo;
+
+    /**
+     * @var string
+     */
+    protected $table;
+
+    /**
+     * @var array
+     */
+    protected $columns;
+
+    public function __construct(\PDO $pdo, string $table, array $columns)
+    {
+        $this->pdo = $pdo;
+        $this->table = $table;
+        $this->columns = $columns;
+    }
+
+    protected function ensureColumnMatch($rowValues): void
+    {
+        $missingValues = array_keys(
+            array_diff_key(array_flip($this->columns), $rowValues)
+        );
+
+        if (count($missingValues)) {
+            throw new MissingValueException(
+                sprintf(
+                    'The supplied row is missing values for %s.',
+                    implode(',', $missingValues)
+                )
+            );
+        }
+    }
+
+    protected function convertRowCollectionToParams(array $rowCollection):array
+    {
+        $params = [];
+
+        foreach ($rowCollection as $row) {
+            $this->ensureColumnMatch($row);
+            $params = array_merge($params, $this->convertRowToParams($row));
+        }
+
+        return $params;
+    }
+
+    protected function convertRowToParams($row):array
+    {
+        $params = [];
+
+        foreach ($this->columns as $col) {
+            $params[] = $row[$col];
+        }
+
+        return $params;
+    }
+}

src/Load/DatabaseLoader/InsertUpdateSql.php → src/Load/DatabaseLoader/BatchInsUpdQueryFactory.php

@@ -7,9 +7,9 @@
 
 namespace MilesAsylum\Slurp\Load\DatabaseLoader;
 
-class InsertUpdateSql
+class BatchInsUpdQueryFactory
 {
-    public function createSql($table, array $columns, $batchSize = 1)
+    public function createQuery($table, array $columns, $batchSize = 1)
     {
         $colsStr = '`' . implode('`, `', $columns) . '`';
         $valueStr = '(' . implode(', ', array_fill(0, count($columns), '?')) . ')';

src/Load/DatabaseLoader/BatchInsUpdStmt.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Author: Courtney Miles
+ * Date: 26/08/18
+ * Time: 8:53 AM
+ */
+
+namespace MilesAsylum\Slurp\Load\DatabaseLoader;
+
+class BatchInsUpdStmt extends AbstractBatchStmt
+{
+    /**
+     * @var BatchInsUpdQueryFactory
+     */
+    private $queryFactory;
+
+    /**
+     * @var \PDOStatement[]
+     */
+    private $preparedBatchStmts = [];
+
+    public function __construct(\PDO $pdo, string $table, array $columns, BatchInsUpdQueryFactory $queryFactory)
+    {
+        parent::__construct($pdo, $table, $columns);
+        $this->queryFactory = $queryFactory;
+    }
+
+    /**
+     * @param array[] $rows
+     */
+    public function write(array $rows)
+    {
+        $this->getPreparedBatchStmt(count($rows))
+            ->execute(
+                $this->convertRowCollectionToParams($rows)
+            );
+    }
+
+    protected function getPreparedBatchStmt($count): \PDOStatement
+    {
+        if (!isset($this->preparedBatchStmts[$count])) {
+            $this->preparedBatchStmts[$count] = $this->pdo->prepare(
+                $this->queryFactory->createQuery(
+                    $this->table,
+                    $this->columns,
+                    $count
+                )
+            );
+        }
+
+        return $this->preparedBatchStmts[$count];
+    }
+}

src/Load/DatabaseLoader/BatchStmtInterface.php

@@ -0,0 +1,13 @@
+<?php
+/**
+ * Author: Courtney Miles
+ * Date: 26/08/18
+ * Time: 8:52 AM
+ */
+
+namespace MilesAsylum\Slurp\Load\DatabaseLoader;
+
+interface BatchStmtInterface
+{
+    public function write(array $rows);
+}

src/Load/DatabaseLoader/DatabaseLoader.php

@@ -7,72 +7,38 @@
 
 namespace MilesAsylum\Slurp\Load\DatabaseLoader;
 
-use MilesAsylum\Slurp\Load\DatabaseLoader\Exception\ColumnMismatchException;
 use MilesAsylum\Slurp\Load\LoaderInterface;
 
 class DatabaseLoader implements LoaderInterface
 {
-    /**
-     * @var \PDO
-     */
-    private $pdo;
-
-    /**
-     * @var InsertUpdateSql
-     */
-    private $queryFactory;
-
-    /**
-     * @var array
-     */
-    private $columns;
-
     /**
      * @var \PDOStatement
      */
     protected $batchStmt;
 
     /**
-     * @var \PDOStatement
+     * @var int
      */
-    protected $singleStmt;
+    protected $batchSize;
 
-    protected $rowCollection = [];
     /**
-     * @var string
+     * @var array[]
      */
-    private $table;
-    /**
-     * @var int
-     */
-    private $batchSize;
+    protected $rowCollection = [];
 
     public function __construct(
-        \PDO $pdo,
-        InsertUpdateSql $queryFactory,
-        string $table,
-        array $columns,
+        BatchStmtInterface $batchStmt,
         int $batchSize = 100
     ) {
-        $this->pdo = $pdo;
-        $this->queryFactory = $queryFactory;
-        $this->table = $table;
-        $this->columns = $columns;
         $this->batchSize = $batchSize;
-        $this->batchStmt = $this->pdo->prepare(
-            $this->queryFactory->createSql($this->table, $this->columns, $this->batchSize)
-        );
-        $this->singleStmt = $this->pdo->prepare(
-            $this->queryFactory->createSql($this->table, $this->columns)
-        );
+        $this->batchStmt = $batchStmt;
     }
 
     public function loadValues(array $values): void
     {
-        $this->ensureColumnMatch($values);
         $this->rowCollection[] = $values;
 
-        if (count($this->rowCollection) == $this->batchSize) {
+        if (count($this->rowCollection) >= $this->batchSize) {
             $this->flush();
         }
     }
@@ -84,52 +50,7 @@ public function finalise(): void
 
     protected function flush(): void
     {
-        if (count($this->rowCollection) == $this->batchSize) {
-            $params = $this->convertRowCollectionToParams($this->rowCollection);
-
-            $this->batchStmt->execute($params);
-            $this->rowCollection = [];
-        } else {
-            foreach ($this->rowCollection as $row) {
-                $this->singleStmt->execute($this->convertRowToParams($row));
-            }
-        }
-    }
-
-    protected function ensureColumnMatch($rowValues): void
-    {
-        $expectedCount = count($this->columns);
-
-        if (count(array_intersect_key(array_flip($this->columns), $rowValues)) < $expectedCount) {
-            throw new ColumnMismatchException(
-                sprintf(
-                    'The supplied row has values for %s where it is expected to have values for %s.',
-                    implode(',', array_keys($rowValues)),
-                    implode(',', $this->columns)
-                )
-            );
-        }
-    }
-
-    protected function convertRowCollectionToParams(array $rowCollection):array
-    {
-        $params = [];
-
-        foreach ($rowCollection as $row) {
-            $params = array_merge($params, $this->convertRowToParams($row));
-        }
-
-        return $params;
-    }
-
-    protected function convertRowToParams($row):array
-    {
-        $params = [];
-
-        foreach ($this->columns as $col) {
-            $params[] = $row[$col];
-        }
-
-        return $params;
+        $this->batchStmt->write($this->rowCollection);
+        $this->rowCollection = [];
     }
 }

src/Load/DatabaseLoader/Exception/MissingValueException.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Author: Courtney Miles
+ * Date: 20/08/18
+ * Time: 10:57 PM
+ */
+
+namespace MilesAsylum\Slurp\Load\DatabaseLoader\Exception;
+
+class MissingValueException extends \InvalidArgumentException implements ExceptionInterface
+{
+}

tests/Slurp/Load/DatabaseLoader/InsertUpdateSqlTest.php → tests/Slurp/Load/DatabaseLoader/BatchInsUpdQueryFactoryTest.php

@@ -7,14 +7,14 @@
 
 namespace MilesAsylum\Slurp\Tests\Slurp\Load\DatabaseLoader;
 
-use MilesAsylum\Slurp\Load\DatabaseLoader\InsertUpdateSql;
+use MilesAsylum\Slurp\Load\DatabaseLoader\BatchInsUpdQueryFactory;
 use PHPUnit\Framework\TestCase;
 
-class InsertUpdateSqlTest extends TestCase
+class BatchInsUpdQueryFactoryTest extends TestCase
 {
     public function testCreateInsertQuery()
     {
-        $queryFactory = new InsertUpdateSql();
+        $queryFactory = new BatchInsUpdQueryFactory();
 
         $expectedInsSql = <<<SQL
 INSERT INTO `foo` (`col_alpha`, `col_beta`)
@@ -23,13 +23,13 @@ public function testCreateInsertQuery()
 SQL;
         $this->assertSame(
             $expectedInsSql,
-            $queryFactory->createSql('foo', ['col_alpha', 'col_beta'])
+            $queryFactory->createQuery('foo', ['col_alpha', 'col_beta'])
         );
     }
 
     public function testCreateInsertQueryBatch()
     {
-        $queryFactory = new InsertUpdateSql();
+        $queryFactory = new BatchInsUpdQueryFactory();
 
         $expectedInsSql = <<<SQL
 INSERT INTO `foo` (`col_alpha`, `col_beta`)
@@ -40,7 +40,7 @@ public function testCreateInsertQueryBatch()
 SQL;
         $this->assertSame(
             $expectedInsSql,
-            $queryFactory->createSql('foo', ['col_alpha', 'col_beta'], 3)
+            $queryFactory->createQuery('foo', ['col_alpha', 'col_beta'], 3)
         );
     }
 }