From: root <sys@15gifts.com>
Date: Fri, 6 Oct 2017 07:39:47 +0000 (+0100)
Subject: rename db.type by db_type
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=c9d1c1713663a4b69744ba8f66e7116ae352583b;p=nb.git

rename db.type by db_type
---

diff --git a/lib/php/db.php b/lib/php/db.php
index 56603c7c..ac74f5bf 100644
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -466,7 +466,7 @@ class Db extends nb {
 
     # Check key exists
     if (empty($db_type[$key])) {
-      if ($die_if_empty) self::bye("db.type(): Unknown key `$key` for type `".$this->type."`");#.' - '.print_r($db_type,true));
+      if ($die_if_empty) self::bye("db_type(): Unknown key `$key` for type `".$this->type."`");#.' - '.print_r($db_type,true));
       return;
     }
 
@@ -985,10 +985,10 @@ class Db extends nb {
 
     # Change db type if needed
     $type_from = $type_to = '';
-    if (self::p('db.type')) {
-      echo "-- Type     : ".self::p('db.type')."\n";
+    if (self::p('db_type')) {
+      echo "-- Type     : ".self::p('db_type')."\n";
       $type_from = $this->type;
-      $type_to = self::p('db.type');
+      $type_to = self::p('db_type');
       $this->type = $type_to;
     }
 
diff --git a/lib/php/db/types/mysql.php b/lib/php/db/types/mysql.php
index 6f448d20..7903cc60 100644
--- a/lib/php/db/types/mysql.php
+++ b/lib/php/db/types/mysql.php
@@ -15,7 +15,7 @@ $DB_TYPES['mysql'] = array (
 'file2table' => "LOAD DATA INFILE '<FILE> REPLACE INTO TABLE '<T.NAME>' TERMINATED BY '\\t' ENCLOSED BY '' LINES TERMINATED BY '\\r\\n' IGNORE 0 LINES",
 
 'table.sql' => 'SHOW CREATE TABLE `<T.NAME>`',
-'table.sql.index' => "SELECT ".(Db::p('db.type') ? "CONCAT(s.TABLE_NAME,'_',s.INDEX_NAME,'_idx')" : 's.INDEX_NAME')." as name,(CASE NON_UNIQUE WHEN 1 THEN 0 ELSE 1 END) as uniqe,GROUP_CONCAT(COLUMN_NAME) as field FROM INFORMATION_SCHEMA.STATISTICS s LEFT OUTER JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS t ON t.TABLE_SCHEMA=s.TABLE_SCHEMA AND t.TABLE_NAME=s.TABLE_NAME  AND s.INDEX_NAME=t.CONSTRAINT_NAME  WHERE 0=0 AND t.CONSTRAINT_NAME IS NULL AND s.TABLE_SCHEMA = DATABASE() AND s.TABLE_NAME='<T.NAME>' GROUP BY name,uniqe,SEQ_IN_INDEX ORDER BY SEQ_IN_INDEX",
+'table.sql.index' => "SELECT ".(Db::p('db_type') ? "CONCAT(s.TABLE_NAME,'_',s.INDEX_NAME,'_idx')" : 's.INDEX_NAME')." as name,(CASE NON_UNIQUE WHEN 1 THEN 0 ELSE 1 END) as uniqe,GROUP_CONCAT(COLUMN_NAME) as field FROM INFORMATION_SCHEMA.STATISTICS s LEFT OUTER JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS t ON t.TABLE_SCHEMA=s.TABLE_SCHEMA AND t.TABLE_NAME=s.TABLE_NAME  AND s.INDEX_NAME=t.CONSTRAINT_NAME  WHERE 0=0 AND t.CONSTRAINT_NAME IS NULL AND s.TABLE_SCHEMA = DATABASE() AND s.TABLE_NAME='<T.NAME>' GROUP BY name,uniqe,SEQ_IN_INDEX ORDER BY SEQ_IN_INDEX",
 # NB 04.07.16 '_table.sql.index' => [
 # NB 04.07.16   'SHOW INDEX FROM `<T.NAME>`', function(&$r) {
 # NB 04.07.16     if ($r['Key_name'] != 'PRIMARY') return [