From 07606476f3501e7a43ef829ffba99fc170ed4d5b Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Mon, 21 Nov 2016 11:56:03 +0000
Subject: [PATCH] dbq for docker

---
 etc/dbq/shell.php         |   1 +
 etc/dbq/zzz-all.php       |   8 ++++++--
 lib/php/db.php            |  12 ++++++++----
 share/db/shell.db         | Bin 53248 -> 53248 bytes
 share/db/update.sh        |   5 ++++-
 src/Docker/php/Dockerfile |   2 +-
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/etc/dbq/shell.php b/etc/dbq/shell.php
index e3cffec6..00c3b453 100644
--- a/etc/dbq/shell.php
+++ b/etc/dbq/shell.php
@@ -6,6 +6,7 @@ if (true or !nb::is_vm()) $DBQ = [
   'shell' => [
     'type' => 'sqlite',
     'name' => 'shell',
+    'default_table' => 'shell_function',
     'host' => nb::ROOT_DIR.'/share/db/shell.db',
   ],
 ];
diff --git a/etc/dbq/zzz-all.php b/etc/dbq/zzz-all.php
index a8491772..abd47f35 100644
--- a/etc/dbq/zzz-all.php
+++ b/etc/dbq/zzz-all.php
@@ -41,6 +41,7 @@ if (!empty($DIR_SQLITE)) {
 $DBQ['all'] = [
   'host' => ':memory:',
   'type' => 'sqlite',
+  'name' => 'all',
   'pdo' => '',
   '_import' => [],
   #'order' => '0',
@@ -48,9 +49,12 @@ $DBQ['all'] = [
     PDO::ATTR_PERSISTENT => true,
   ],
   'tables' => [],
+  'types' => [
+    'sql_pre' => [],
+  ],
   'sql_pre' => [
     #'PRAGMA synchronous=NORMAL',
-    'PRAGMA busy_timeout = 1000',
+    'PRAGMA busy_timeout = 10000',
     'PRAGMA journal_mode=MEMORY',
   ],
 ];
@@ -70,7 +74,7 @@ foreach ($DBQ as $id => $db) {
   $fname = basename($db['host'],'.db');
   $fname = preg_replace('/\..*$/','',basename($db['host']));
 
-  #$DBQ['all']['types']['sql_pre'][] = "DETACH DATABASE '".$db['host']."'";
+  #array_unshift($DBQ['all']['types']['sql_pre'],"ATTACH DATABASE '".$db['host']."' as ".$fname);
   $DBQ['all']['types']['sql_pre'][] = "ATTACH DATABASE '".$db['host']."' as ".$fname;
   $DBQ['all']['_import'] = empty($DBQ['all']['_import']) ? [] : (array)$DBQ['all']['_import'];
   $DBQ['all']['_import'][] = $id;
diff --git a/lib/php/db.php b/lib/php/db.php
index 32d9b6d4..527f2e6b 100644
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -288,7 +288,11 @@ class Db extends nb {
       }
     }
 
+    #try {
     foreach ($this->sql_pre() as $s) { $this->conn->exec($s); }
+    #} catch (PDOException $e) {
+    #return false;
+    #}
 
     return true;
   }
@@ -1125,16 +1129,16 @@ class Db extends nb {
   public function sql_pre() {
     $return = [];
 
-    foreach ((array)$this->conf_type('sql_pre') as $s) {
-      if (!empty($s)) $return[] = $s;
-    }
-
     if (!empty($this->sql_pre)) {
       foreach ((array)$this->sql_pre as $s) {
         if (!empty($s)) $return[] = $s;
       }
     }
 
+    foreach ((array)$this->conf_type('sql_pre') as $s) {
+      if (!empty($s)) $return[] = $s;
+    }
+
     return $return;
   }
 
diff --git a/share/db/shell.db b/share/db/shell.db
index c138a646dfcdbd58a461a04857188d75181875c2..f8fae83dc5b580d8dea9b59bf896d00a70578146 100644
GIT binary patch
delta 2883
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

delta 4153
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
F`frnr^cVmD

diff --git a/share/db/update.sh b/share/db/update.sh
index 32fec4f5..e516313c 100755
--- a/share/db/update.sh
+++ b/share/db/update.sh
@@ -2,6 +2,8 @@
 set -e
 cd "$(dirname "$0")"
 
+echo "Create shell.db"
+
 (
 
 cat << EOF
@@ -14,5 +16,6 @@ shell_functions2sql shell_function
 cat << EOF
 COMMIT;
 EOF
-) | sqlite3 local.db.tmp && mv local.db.tmp local.db
+
+) | sqlite3 shell.db.tmp && mv shell.db.tmp shell.db
 
diff --git a/src/Docker/php/Dockerfile b/src/Docker/php/Dockerfile
index 4c35d058..d011c27f 100644
--- a/src/Docker/php/Dockerfile
+++ b/src/Docker/php/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir /opt
 # Install Postgre PDO
 #RUN export DEBIAN_FRONTEND=noninteractive && apt-get -q=2 update && apt-get -q=2 -y install libpq-dev
 #RUN docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql
-RUN set -ex && apk --no-cache add postgresql-dev sqlite perl perl-uri perl-encode
+RUN set -ex && apk --no-cache add postgresql-dev sqlite perl perl-uri
 RUN docker-php-ext-install pdo pdo_mysql pdo_sqlite pdo_sqlite pdo_pgsql pgsql
 RUN mkdir -p /var/www/html && echo '<html><head><title>Welcom to php:7.0-fpm-alpine</title></head><body><h1>Welcom to php:7.0-fpm-alpine</h1></body></html>' > /var/www/html/index.php
 
-- 
2.47.3