update

workbunny · Jun 16, 2022 · 4cfe15f · 4cfe15f
1 parent fbfd901
commit 4cfe15f
Show file tree

Hide file tree

Showing 9 changed files with 317 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
   },
   "autoload-dev": {
     "psr-4": {
-      "Test\\": "test"
+      "Tests\\": "tests"
     },
     "files": [
       "./src/dev.php"

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- PHPUnit configuration file with new format for PHPUnit 9.3+ -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheResult="false"
+         colors="true"
+         convertDeprecationsToExceptions="true">
+    <testsuites>
+        <testsuite name="stroage test suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <include>
+            <directory>./src/</directory>
+        </include>
+    </coverage>
+</phpunit>
diff --git a/src/Driver.php b/src/Driver.php
@@ -122,7 +122,9 @@ public function connect() : void
     /** 关闭连接 */
     public function close()
     {
-        $this->_driver->close();
+        if($this->_driver instanceof SQLite3){
+            $this->_driver->close();
+        }
         $this->_driver = null;
     }
 
@@ -145,6 +147,7 @@ public function configs() : array
     }
 
     /**
+     * 执行
      * @param string $statement
      * @return bool
      * @throws StorageException
@@ -174,6 +177,7 @@ public function exec(string $statement): bool
     }
 
     /**
+     * query执行
      * @param string $statement
      * @param array $map
      * @return SQLite3Result|null
@@ -204,6 +208,7 @@ public function query(string $statement, array $map = []): ?SQLite3Result
     }
 
     /**
+     * 预处理执行
      * @param string $statement
      * @param array $map
      * @return SQLite3Result|null
@@ -319,7 +324,7 @@ public function create(string $table, array $columns, array $indexSQLs = []): bo
             }
         }
 
-        $command = "CREATE TABLE IF NOT EXISTS {$tableName} (" . implode(', ', $stack) . ');';
+        $command = "CREATE TABLE IF NOT EXISTS {$tableName} (" . implode(',', $stack) . ');';
         foreach ($indexSQLs as $indexSQL){
             $command .= $indexSQL;
         }

diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -0,0 +1,39 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests;
+
+use PHPUnit\Framework\TestCase;
+use WorkBunny\Storage\Driver;
+
+class BaseTestCase extends TestCase
+{
+    protected ?Driver $_driver = null;
+
+    /**
+     * @return void
+     */
+    public function setUp(): void
+    {
+        if(!$this->_driver){
+            $this->_driver = new Driver([
+                'filename' => ':memory',
+                'debug'    => true
+            ]);
+        }
+        parent::setUp();
+    }
+
+    /**
+     * @return Driver|null
+     */
+    public function driver(): ?Driver
+    {
+        return $this->_driver;
+    }
+
+    protected function _expectedQuery(string $expected): string
+    {
+        return str_replace(["\r\n", "\r", "\n", "\t", '    '], '', $expected);
+    }
+}
diff --git a/tests/CreateTest.php b/tests/CreateTest.php
@@ -0,0 +1,85 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests;
+
+class CreateTest extends BaseTestCase
+{
+    public function testCreateTable()
+    {
+        $this->driver()->create("account", [
+            "id" => [
+                "INT",
+                "PRIMARY KEY",
+                "NOT NULL",
+                "AUTOINCREMENT"
+            ],
+            "name" => [
+                "VARCHAR(25)",
+                "NOT NULL",
+                "UNIQUE"
+            ],
+        ]);
+
+        $this->assertEquals(
+            $this->_expectedQuery(<<<doc
+CREATE TABLE IF NOT EXISTS `account` (
+    `id` INT PRIMARY KEY NOT NULL AUTOINCREMENT,
+    `name` VARCHAR(25) NOT NULL UNIQUE
+);
+doc)
+            ,
+            $this->driver()->last(true)[0]
+        );
+    }
+
+    public function testCreateTableUseIndex()
+    {
+        $this->driver()->create("account", [
+            "id" => [
+                "INT",
+                "PRIMARY KEY",
+                "NOT NULL",
+                "AUTOINCREMENT"
+            ],
+            "name" => [
+                "VARCHAR(25)",
+                "NOT NULL",
+                "UNIQUE"
+            ],
+        ],[
+            "CREATE INDEX `account_name` ON `account` (`name`);"
+        ]);
+
+        $this->assertEquals(
+            $this->_expectedQuery(<<<doc
+CREATE TABLE IF NOT EXISTS `account` (
+    `id` INT PRIMARY KEY NOT NULL AUTOINCREMENT,
+    `name` VARCHAR(25) NOT NULL UNIQUE
+);
+CREATE INDEX `account_name` ON `account` (`name`);
+doc)
+            ,
+            $this->driver()->last(true)[0]
+        );
+    }
+
+    public function testCreateTableWithStringDefinition()
+    {
+        $this->driver()->create("account", [
+            "id"   => "INT PRIMARY KEY NOT NULL AUTOINCREMENT",
+            "name" => "VARCHAR(25) NOT NULL UNIQUE"
+        ]);
+
+        $this->assertEquals(
+            $this->_expectedQuery(<<<doc
+CREATE TABLE IF NOT EXISTS `account` (
+    `id` INT PRIMARY KEY NOT NULL AUTOINCREMENT,
+    `name` VARCHAR(25) NOT NULL UNIQUE
+);
+doc)
+            ,
+            $this->driver()->last(true)[0]
+        );
+    }
+}
diff --git a/tests/DropTest.php b/tests/DropTest.php
@@ -0,0 +1,21 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests;
+
+class DropTest extends BaseTestCase
+{
+
+    public function testDrop()
+    {
+        $this->driver()->drop("account");
+
+        $this->assertEquals(
+            $this->_expectedQuery(<<<doc
+DROP TABLE IF EXISTS `account`
+doc)
+            ,
+            $this->driver()->last(true)[0]
+        );
+    }
+}
diff --git a/tests/InsertTest.php b/tests/InsertTest.php
@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests;
+
+
+class InsertTest extends BaseTestCase
+{
+
+    public function testInsertSingle()
+    {
+
+        $this->driver()->insert("account", [
+            "id" => 1,
+            "name" => "test"
+        ]);
+
+        $this->assertEquals(
+            $this->_expectedQuery(<<<doc
+INSERT INTO `account` (`id`, `name`) VALUES (1, 'test')
+doc)
+            ,
+            $this->driver()->last(true)[0]
+        );
+    }
+
+    public function testInsertMulti()
+    {
+        $this->driver()->insert("account", [
+            [
+                "id" => 1,
+                "name" => "test1"
+            ],
+            [
+                "id" => 2,
+                "name" => "test2"
+            ]
+        ]);
+
+        $this->assertEquals(
+            $this->_expectedQuery(<<<doc
+INSERT INTO `account` (`id`, `name`) VALUES (1, 'test1'), (2, 'test2')
+doc)
+            ,
+            $this->driver()->last(true)[0]
+        );
+    }
+}
diff --git a/tests/QueryTest.php b/tests/QueryTest.php
@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+
+namespace Tests;
+
+
+class QueryTest extends BaseTestCase
+{
+
+    public function testInsertSingle()
+    {
+
+        $this->driver()->insert("account", [
+            "id" => 1,
+            "name" => "test"
+        ]);
+
+        $this->assertEquals(
+            $this->_expectedQuery(<<<doc
+INSERT INTO `account` (`id`, `name`) VALUES (1, 'test')
+doc)
+            ,
+            $this->driver()->last(true)[0]
+        );
+    }
+
+    public function testInsertMulti()
+    {
+        $this->driver()->insert("account", [
+            [
+                "id" => 1,
+                "name" => "test1"
+            ],
+            [
+                "id" => 2,
+                "name" => "test2"
+            ]
+        ]);
+
+        $this->assertEquals(
+            $this->_expectedQuery(<<<doc
+INSERT INTO `account` (`id`, `name`) VALUES (1, 'test1'), (2, 'test2')
+doc)
+            ,
+            $this->driver()->last(true)[0]
+        );
+    }
+}
diff --git a/tests/xhprof.php b/tests/xhprof.php
@@ -0,0 +1,48 @@
+<?php
+declare(strict_types=1);
+require_once './../vendor/autoload.php';
+
+ini_set('memory_limit', '-1');
+
+$s = new \WorkBunny\Storage\Driver([
+    'filename' => ':memory:'
+]);
+
+$s->create('main',[
+    "id" => [
+        "INT",
+        "NOT NULL",
+        "PRIMARY KEY"
+    ],
+    "name" => [
+        "VARCHAR(30)",
+        "NOT NULL"
+    ]
+]);
+$sql = [];
+xhprof(function() use ($s, &$sql){
+
+//    $s->action(function () use ($s){
+//        for ($i = 0; $i < 10000; $i ++){
+//            $s->insert('main', [
+//                'id' => $i,
+//                'name' => 'aka_' . $i
+//            ]);
+//        }
+//    });
+
+    for ($i = 0; $i < 10000; $i ++){
+        $data[] = [
+            'id' => $i,
+            'name' => 'aka_' . $i
+        ];
+    }
+
+    $s->insert('main', $data);
+
+//    $sql = $s->last();
+}, true);
+
+dump($sql);
+
+