Attogram Database v1.1.0 - setCreateTables() via string or array

Author: attogram

.gitignore

@@ -1,3 +1,3 @@
 .idea/
 vendor/
-examples/test.sqlite
+examples/test.*.sqlite

README.md

@@ -1,8 +1,8 @@
 # Attogram Database
 
-ALPHA RELEASE
+_BETA RELEASE_
 
-PHP access to SQLite databases
+PHP access to SQLite databases.
 
 [![Maintainability](https://api.codeclimate.com/v1/badges/473e68db98ac442429c1/maintainability)](https://codeclimate.com/github/attogram/database/maintainability)
 [![Build Status](https://travis-ci.org/attogram/database.svg?branch=master)](https://travis-ci.org/attogram/database)
@@ -13,25 +13,54 @@ PHP access to SQLite databases
 composer require attogram/database
 ```
 
-## Example
+## Examples
 
+one table:
 ```php
-<?php
 declare(strict_types = 1);
 
 use Attogram\Database\Database;
 
 require '../vendor/autoload.php';
 
 $database = new Database();
+$database->setDatabaseFile('./test.one.sqlite');
+$database->setCreateTables("CREATE TABLE 'one' ('foo' TEXT)");
 
-$database->setDatabaseFile('./test.sqlite');
+try {
+    $database->raw("INSERT INTO one ('foo') VALUES (CURRENT_TIMESTAMP)");
+    $arrayResults = $database->query("SELECT * FROM 'one'");
+    print_r($arrayResults);
+} catch (Throwable $error) {
+    print 'ERROR: ' . $error->getMessage();
+}
+```
 
-$database->setCreateTables("CREATE TABLE 'foo' ('bar' TEXT)");
+two tables:
+```php
+declare(strict_types = 1);
 
-$database->raw("INSERT INTO foo ('bar') VALUES ('baz')");
+use Attogram\Database\Database;
 
-$arrayResults = $database->query("SELECT * FROM 'foo'");
+require '../vendor/autoload.php';
 
-print_r($arrayResults);
-```
+$database = new Database();
+$database->setDatabaseFile('./test.two.sqlite');
+
+$tables = [
+    "CREATE TABLE 'one' ('foo' TEXT)",
+    "CREATE TABLE 'two' ('bar' TEXT)",
+];
+$database->setCreateTables($tables);
+
+try {
+    $database->raw("INSERT INTO one ('foo') VALUES (CURRENT_TIMESTAMP)");
+    $database->raw("INSERT INTO two ('bar') VALUES (CURRENT_TIMESTAMP)");
+    $arrayResults = $database->query("SELECT * FROM 'one'");
+    print_r($arrayResults);
+    $arrayResults = $database->query("SELECT * FROM 'two'");
+    print_r($arrayResults);
+} catch (Throwable $error) {
+    print 'ERROR: ' . $error->getMessage();
+}
+```

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "attogram/database",
-  "description": "PHP access to SQLite database",
+  "description": "PHP access to SQLite databases.",
   "type": "project",
   "license": "MIT",
   "homepage": "https://github.com/attogram/database",

examples/one.table.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Attogram Database
+ * @see https://github.com/attogram/database
+ *
+ * Example: one table
+ */
+declare(strict_types = 1);
+
+use Attogram\Database\Database;
+
+require '../vendor/autoload.php';
+
+$database = new Database();
+$database->setDatabaseFile('./test.one.sqlite');
+$database->setCreateTables("CREATE TABLE 'one' ('foo' TEXT)");
+
+try {
+    $database->raw("INSERT INTO one ('foo') VALUES (CURRENT_TIMESTAMP)");
+    $arrayResults = $database->query("SELECT * FROM 'one'");
+    print_r($arrayResults);
+} catch (Throwable $error) {
+    print 'ERROR: ' . $error->getMessage();
+}

examples/simple.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Attogram Database
+ * @see https://github.com/attogram/database
+ *
+ * Example: two tables
+ */
+declare(strict_types = 1);
+
+use Attogram\Database\Database;
+
+require '../vendor/autoload.php';
+
+$database = new Database();
+$database->setDatabaseFile('./test.two.sqlite');
+
+$tables = [
+    "CREATE TABLE 'one' ('foo' TEXT)",
+    "CREATE TABLE 'two' ('bar' TEXT)",
+];
+$database->setCreateTables($tables);
+
+try {
+    $database->raw("INSERT INTO one ('foo') VALUES (CURRENT_TIMESTAMP)");
+    $database->raw("INSERT INTO two ('bar') VALUES (CURRENT_TIMESTAMP)");
+    $arrayResults = $database->query("SELECT * FROM 'one'");
+    print_r($arrayResults);
+    $arrayResults = $database->query("SELECT * FROM 'two'");
+    print_r($arrayResults);
+} catch (Throwable $error) {
+    print 'ERROR: ' . $error->getMessage();
+}
+

examples/two.tables.php

@@ -1,4 +1,8 @@
 <?php
+/**
+ * Attogram Database
+ * @see https://github.com/attogram/database
+ */
 declare(strict_types = 1);
 
 namespace Attogram\Database;
@@ -15,16 +19,16 @@
 class Database
 {
     /** @var string */
-    const VERSION = '1.0.0-pre.4';
+    const VERSION = '1.1.0';
 
     /** @var bool */
     private $connected = false;
 
-    /** @var string */
-    private $createTables;
+    /** @var array */
+    private $createTables = [];
 
     /** @var string */
-    private $databaseFile;
+    private $databaseFile = 'database.sqlite';
 
     /** @var PDO */
     private $pdo;
@@ -38,11 +42,20 @@ public function setDatabaseFile(string $databaseFile)
     }
 
     /**
-     * @param string $createTables
+     * @param string|array $createTables
      */
-    public function setCreateTables(string $createTables)
+    public function setCreateTables($createTables)
     {
-        $this->createTables = $createTables;
+        if (empty($createTables)) {
+            return;
+        }
+        if (is_string($createTables)) {
+            $this->createTables[] = $createTables;
+            return;
+        }
+        if (is_array($createTables)) {
+            $this->createTables = array_merge($this->createTables, $createTables);
+        }
     }
 
     /**
@@ -70,19 +83,29 @@ public function connect()
         $this->pdo = new PDO('sqlite:'. $this->databaseFile);
         $this->connected = true;
         if ($doCreateTables && !empty($this->createTables)) {
-            $this->raw($this->createTables);
+            $this->createTables();
         }
     }
 
     /**
-     * SQL query, returns results in an array
+     * @throws Exception
+     */
+    private function createTables()
+    {
+        foreach ($this->createTables as $table) {
+            $this->raw($table);
+        }
+    }
+
+    /**
+     * SQL query, return results as an array
      *
      * @param string $sql
      * @param array $bind
      * @return array
      * @throws Exception
      */
-    public function query(string $sql, array $bind = []) :array
+    public function query(string $sql, array $bind = []): array
     {
         if (!$this->connected) {
             $this->connect();
@@ -107,9 +130,10 @@ public function query(string $sql, array $bind = []) :array
      *
      * @param string $sql
      * @param array $bind
+     * @return bool
      * @throws Exception
      */
-    public function raw(string $sql, array $bind = [])
+    public function raw(string $sql, array $bind = []): bool
     {
         if (!$this->connected) {
             $this->connect();
@@ -121,7 +145,11 @@ public function raw(string $sql, array $bind = [])
         $result = $statement->execute($bind);
         if (!$result && ($this->pdo->errorCode() != '00000')) {
             $this->pdoFail('raw: execute statement failed');
+
+            return false;
         }
+
+        return true;
     }
 
     /**