etc/profile.d/dbq.sh

diff --git a/etc/profile.d/dbq.sh b/etc/profile.d/dbq.sh
index 91c71b52b66e534dce56281b4fbe20f00b3a693a..8660e1365e09a8d55499f592787bd050f1266358 100644 (file)
--- a/etc/profile.d/dbq.sh
+++ b/etc/profile.d/dbq.sh
@@ -1,15 +1,15 @@
 which dbq > /dev/null || return 0
 
 dbq2sqlite() {
-  dbq f=txt a=db.dump db_type=sqlite $@
+  dbq f=txt a=db.dump db-type=sqlite $@
 }
 
 dbq2mysql() {
-  dbq f=txt a=db.dump db_type=mysql $@
+  dbq f=txt a=db.dump db-type=mysql $@
 }
 
 dbq2pgsql() {
-  dbq f=txt a=db.dump db_type=pgsql $@
+  dbq f=txt a=db.dump db-type=pgsql $@
 }
 
 dbq_template() {

diff --git a/lib/php/db.php b/lib/php/db.php
index f4a91f56c66b49d2bc6b73b4ddd95c02e776e882..64cce67de591bcf955bf5c9ac656bc69d769be53 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -978,7 +978,7 @@ class Db extends nb {
 
   public function sql($insert=null,$db_type='') {
     if ($insert === null) $insert = self::p('insert');
-    if (empty($db_type)) $db_type = self::p('db_type');
+    if (empty($db_type)) $db_type = self::p('db-type');
 
     # Params ! dirty !
 # NB 10.01.18     $this->pset('orderby',null);

diff --git a/lib/php/db/types/mysql.php b/lib/php/db/types/mysql.php
index f3a66d4657ee0ce1e5cc9a14b85aa9c566e85d78..8a2ff631b734fcfc9fada64a733c3e940a8ba005 100644 (file)
--- 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 [