diff --git a/install-dev/sql/db.sql b/install-dev/sql/db.sql index d2d80d1ba..2b453cb29 100644 --- a/install-dev/sql/db.sql +++ b/install-dev/sql/db.sql @@ -1794,12 +1794,6 @@ CREATE TABLE `PREFIX_import_match` ( PRIMARY KEY (`id_import_match`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; -CREATE TABLE `PREFIX_address_format` ( - `id_country` int(10) unsigned NOT NULL, - `format` varchar(255) NOT NULL DEFAULT '', - KEY `country` (`id_country`) -) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; - CREATE TABLE IF NOT EXISTS `PREFIX_group_shop` ( `id_group_shop` int(11) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(64) CHARACTER SET utf8 NOT NULL, @@ -1825,19 +1819,19 @@ CREATE TABLE IF NOT EXISTS `PREFIX_shop` ( KEY `id_theme` (`id_theme`) ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; - CREATE TABLE IF NOT EXISTS `PREFIX_shop_url` ( - `id_shop_url` int(11) unsigned NOT NULL AUTO_INCREMENT, - `id_shop` int(11) unsigned NOT NULL, - `domain` varchar(255) NOT NULL, - `domain_ssl` varchar(255) NOT NULL, - `physical_uri` varchar(64) NOT NULL, - `virtual_uri` varchar(64) NOT NULL, - `main` TINYINT(1) NOT NULL, - `active` TINYINT(1) NOT NULL, - PRIMARY KEY (`id_shop_url`), - KEY `id_shop` (`id_shop`), - UNIQUE KEY `shop_url` (`domain`, `virtual_uri`) - ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `PREFIX_shop_url` ( + `id_shop_url` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_shop` int(11) unsigned NOT NULL, + `domain` varchar(255) NOT NULL, + `domain_ssl` varchar(255) NOT NULL, + `physical_uri` varchar(64) NOT NULL, + `virtual_uri` varchar(64) NOT NULL, + `main` TINYINT(1) NOT NULL, + `active` TINYINT(1) NOT NULL, + PRIMARY KEY (`id_shop_url`), + KEY `id_shop` (`id_shop`), + UNIQUE KEY `shop_url` (`domain`, `virtual_uri`) +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `PREFIX_theme` ( `id_theme` int(11) NOT NULL AUTO_INCREMENT, diff --git a/install-dev/sql/db_settings_extends.sql b/install-dev/sql/db_settings_extends.sql index 00f69024d..47235c3d9 100644 --- a/install-dev/sql/db_settings_extends.sql +++ b/install-dev/sql/db_settings_extends.sql @@ -866,85 +866,6 @@ INSERT INTO `PREFIX_search_word` (`id_word`, `id_lang`, `word`) VALUES (1, 1, 'i INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 2, id_tab, 1, 1, 1, 1 FROM PREFIX_tab); INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) VALUES -(2, 1, 1, 1, 1, 1), -(2, 2, 1, 1, 1, 1), -(2, 3, 1, 1, 1, 1), -(2, 4, 0, 0, 0, 0), -(2, 5, 1, 1, 1, 1), -(2, 6, 0, 0, 0, 0), -(2, 7, 0, 0, 0, 0), -(2, 8, 0, 0, 0, 0), -(2, 9, 0, 0, 0, 0), -(2, 10, 0, 0, 0, 0), -(2, 11, 0, 0, 0, 0), -(2, 12, 1, 1, 1, 1), -(2, 13, 1, 1, 1, 1), -(2, 14, 0, 0, 0, 0), -(2, 15, 0, 0, 0, 0), -(2, 16, 0, 0, 0, 0), -(2, 17, 1, 1, 1, 1), -(2, 18, 0, 0, 0, 0), -(2, 19, 0, 0, 0, 0), -(2, 20, 1, 1, 1, 1), -(2, 21, 1, 1, 1, 1), -(2, 22, 0, 0, 0, 0), -(2, 23, 0, 0, 0, 0), -(2, 24, 0, 0, 0, 0), -(2, 26, 0, 0, 0, 0), -(2, 27, 0, 0, 0, 0), -(2, 28, 0, 0, 0, 0), -(2, 29, 0, 0, 0, 0), -(2, 30, 0, 0, 0, 0), -(2, 31, 0, 0, 0, 0), -(2, 32, 0, 0, 0, 0), -(2, 33, 0, 0, 0, 0), -(2, 34, 1, 1, 1, 1), -(2, 35, 0, 0, 0, 0), -(2, 36, 0, 0, 0, 0), -(2, 37, 0, 0, 0, 0), -(2, 38, 0, 0, 0, 0), -(2, 39, 0, 0, 0, 0), -(2, 40, 0, 0, 0, 0), -(2, 41, 0, 0, 0, 0), -(2, 42, 1, 1, 1, 1), -(2, 43, 0, 0, 0, 0), -(2, 44, 0, 0, 0, 0), -(2, 46, 0, 0, 0, 0), -(2, 47, 1, 1, 1, 1), -(2, 48, 0, 0, 0, 0), -(2, 49, 1, 1, 1, 1), -(2, 51, 0, 0, 0, 0), -(2, 52, 0, 0, 0, 0), -(2, 53, 0, 0, 0, 0), -(2, 54, 0, 0, 0, 0), -(2, 55, 1, 1, 1, 1), -(2, 56, 0, 0, 0, 0), -(2, 57, 0, 0, 0, 0), -(2, 58, 0, 0, 0, 0), -(2, 59, 1, 1, 1, 1), -(2, 60, 1, 1, 1, 1), -(2, 61, 0, 0, 0, 0), -(2, 62, 0, 0, 0, 0), -(2, 63, 0, 0, 0, 0), -(2, 64, 0, 0, 0, 0), -(2, 65, 0, 0, 0, 0), -(2, 66, 0, 0, 0, 0), -(2, 67, 0, 0, 0, 0), -(2, 68, 0, 0, 0, 0), -(2, 69, 0, 0, 0, 0), -(2, 70, 0, 0, 0, 0), -(2, 71, 0, 0, 0, 0), -(2, 72, 0, 0, 0, 0), -(2, 73, 1, 1, 1, 1), -(2, 80, 0, 0, 0, 0), -(2, 81, 0, 0, 0, 0), -(2, 82, 0, 0, 0, 0), -(2, 83, 0, 0, 0, 0), -(2, 84, 0, 0, 0, 0), -(2, 85, 0, 0, 0, 0), -(2, 86, 0, 0, 0, 0), -(2, 87, 0, 0, 0, 0), -(2, 88, 1, 1, 1, 1), (3, 1, 1, 1, 1, 1), (3, 2, 1, 1, 1, 1), (3, 3, 1, 1, 1, 1), @@ -1234,8 +1155,7 @@ INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `del (5, 103, 1, 1, 1, 1), (5, 104, 1, 1, 1, 1), (5, 105, 0, 0, 0, 0), -(5, 106, 0, 0, 0, 0), -(4, 88, 1, 1, 1, 1); +(5, 106, 0, 0, 0, 0); INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 2, id_module, 0, 1 FROM PREFIX_module); INSERT INTO `PREFIX_module_access` (`id_profile`, `id_module`, `configure`, `view`) (SELECT 3, id_module, 0, 1 FROM PREFIX_module); diff --git a/install-dev/xml/createDB.php b/install-dev/xml/createDB.php index 1d36b32c3..42d4c48fe 100644 --- a/install-dev/xml/createDB.php +++ b/install-dev/xml/createDB.php @@ -138,7 +138,7 @@ switch (_DB_TYPE_) if (!Db::getInstance()->Execute($query)) { if (Db::getInstance()->getNumberError() == 1050) - { + {echo $query.'
'; $logger->logError('A Prestashop database already exists, please drop it or change the prefix.'); die(''."\n"); }