From 41ca4a9dcc5f93c0d90773f0dab76c6af0ee52d8 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Thu, 4 Jan 2018 23:02:58 +0000
Subject: [PATCH] lib/php/db/config.php

---
 lib/php/db/config.php                         | 10 ++---
 .../show_create_table.sql}                    |  0
 lib/postgres/functions.sql                    | 38 ++-----------------
 {share/sql => lib/postgres}/geo.sql           |  0
 {share/sql => lib/postgres}/host.sql          |  0
 {share/sql => lib/postgres}/host_info.sql     |  0
 {share/sql => lib/postgres}/zipcode           |  0
 {share/sql => lib/postgres}/zipcode.sql       |  0
 .../{default.conf => default.conf.TODEL}      |  0
 9 files changed, 9 insertions(+), 39 deletions(-)
 rename lib/postgres/{function-show_create_table.sql => function/show_create_table.sql} (100%)
 rename {share/sql => lib/postgres}/geo.sql (100%)
 rename {share/sql => lib/postgres}/host.sql (100%)
 rename {share/sql => lib/postgres}/host_info.sql (100%)
 rename {share/sql => lib/postgres}/zipcode (100%)
 rename {share/sql => lib/postgres}/zipcode.sql (100%)
 rename www/dbq/etc/nginx/{default.conf => default.conf.TODEL} (100%)

diff --git a/lib/php/db/config.php b/lib/php/db/config.php
index d4354fa1..df5dd195 100644
--- a/lib/php/db/config.php
+++ b/lib/php/db/config.php
@@ -5,11 +5,11 @@ if (empty($_SERVER['HOME'])) $_SERVER['HOME'] = '';
 $DB_CONFS = array_merge([],
 
   # ::ROOT_DIR
-  [
-    Db::ROOT_DIR.'/etc/dbq.yml',
-    Db::ROOT_DIR.'/etc/dbq.yaml',
-    Db::ROOT_DIR.'/etc/dbq.php',
-  ],
+# NB 04.01.18   [
+# NB 04.01.18     Db::ROOT_DIR.'/etc/dbq.yml',
+# NB 04.01.18     Db::ROOT_DIR.'/etc/dbq.yaml',
+# NB 04.01.18     Db::ROOT_DIR.'/etc/dbq.php',
+# NB 04.01.18   ],
   (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yml'),
   (array)glob(Db::ROOT_DIR.'/etc/dbq/*.yaml'),
   (array)glob(Db::ROOT_DIR.'/etc/dbq/*.php'),
diff --git a/lib/postgres/function-show_create_table.sql b/lib/postgres/function/show_create_table.sql
similarity index 100%
rename from lib/postgres/function-show_create_table.sql
rename to lib/postgres/function/show_create_table.sql
diff --git a/lib/postgres/functions.sql b/lib/postgres/functions.sql
index 6fbe9041..1e139777 100644
--- a/lib/postgres/functions.sql
+++ b/lib/postgres/functions.sql
@@ -27,37 +27,7 @@ RETURNS TEXT
 $$;
 */
 
-DROP FUNCTION IF EXISTS STRFTIME(format text,sdate text);
-CREATE OR REPLACE FUNCTION STRFTIME(format text,sdate text)
-RETURNS text AS $$
-SELECT to_char(sdate::date,format)
-$$ LANGUAGE sql;
-
-DROP FUNCTION IF EXISTS DATE(sdate text, sinterval text);
-CREATE OR REPLACE FUNCTION DATE(sdate text DEFAULT 'now', sinterval text DEFAULT '0 seconds')
-RETURNS date AS $$
-SELECT to_char(sdate::date + sinterval::interval,'YYYY-MM-DD')::date;
-$$ LANGUAGE sql;
-
--- NB 22.06.16 CREATE OR REPLACE FUNCTION GROUP_CONCAT(anyarray, sep text DEFAULT ',', nullstr text DEFAULT '')
--- NB 22.06.16 RETURNS text AS $$
--- NB 22.06.16 SELECT array_to_string( ARRAY( SELECT coalesce(v::text, $3) FROM unnest($1) g(v) ), $2 )
--- NB 22.06.16 $$ LANGUAGE sql;
-
-CREATE OR REPLACE FUNCTION GROUP_CONCAT(str text,sep text DEFAULT ',', nullstr text DEFAULT '')
-RETURNS text AS $$
-SELECT array_to_string(array_agg(coalesce(str,nullstr)),sep)
-$$ LANGUAGE sql;
-
-DROP FUNCTION IF EXISTS CIDR_RANGE(cidr text, ip text);
-CREATE OR REPLACE FUNCTION CIDR_RANGE(cidr text, ip text)
-RETURNS bool AS $$
-SELECT ip::inet << cidr::cidr
-$$ LANGUAGE sql;
-
--- NB 21.06.16 CREATE AGGREGATE GROUP_CONCAT(field,sep=',')
--- NB 21.06.16   sfunc = array_append,
--- NB 21.06.16   stype = anyarray,
--- NB 21.06.16   initcond = '{}'
--- NB 21.06.16   -- return array_to_string(array_agg(field),sep)
--- NB 21.06.16 }
+
+
+
+
diff --git a/share/sql/geo.sql b/lib/postgres/geo.sql
similarity index 100%
rename from share/sql/geo.sql
rename to lib/postgres/geo.sql
diff --git a/share/sql/host.sql b/lib/postgres/host.sql
similarity index 100%
rename from share/sql/host.sql
rename to lib/postgres/host.sql
diff --git a/share/sql/host_info.sql b/lib/postgres/host_info.sql
similarity index 100%
rename from share/sql/host_info.sql
rename to lib/postgres/host_info.sql
diff --git a/share/sql/zipcode b/lib/postgres/zipcode
similarity index 100%
rename from share/sql/zipcode
rename to lib/postgres/zipcode
diff --git a/share/sql/zipcode.sql b/lib/postgres/zipcode.sql
similarity index 100%
rename from share/sql/zipcode.sql
rename to lib/postgres/zipcode.sql
diff --git a/www/dbq/etc/nginx/default.conf b/www/dbq/etc/nginx/default.conf.TODEL
similarity index 100%
rename from www/dbq/etc/nginx/default.conf
rename to www/dbq/etc/nginx/default.conf.TODEL
-- 
2.47.3