mirror of
https://github.com/YunoHost-Apps/phpmyadmin_ynh.git
synced 2024-09-03 19:56:46 +02:00
[enh] support for 4.3+ with table upgrade
This commit is contained in:
Julien Malik
parent
2ca75a745f
commit
5a92ba041e
5 changed files with 6 additions and 310 deletions
|
|
@ -69,6 +69,8 @@ $cfg['Servers'][$i]['users'] = 'pma__users';
|
||||||
$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
|
$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
|
||||||
$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
|
$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
|
||||||
$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
|
$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
|
||||||
|
$cfg['Servers'][$i]['favorite'] = 'pma__favorite';
|
||||||
|
$cfg['Servers'][$i]['central_columns'] = 'pma__central_columns';
|
||||||
|
|
||||||
/* Contrib / Swekey authentication */
|
/* Contrib / Swekey authentication */
|
||||||
// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
|
// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
|
||||||
|
|
|
||||||
|
|
@ -1,306 +0,0 @@
|
||||||
-- --------------------------------------------------------
|
|
||||||
-- SQL Commands to set up the pmadb as described in the documentation.
|
|
||||||
--
|
|
||||||
-- This file is meant for use with MySQL 5 and above!
|
|
||||||
--
|
|
||||||
-- This script expects the user pma to already be existing. If we would put a
|
|
||||||
-- line here to create him too many users might just use this script and end
|
|
||||||
-- up with having the same password for the controluser.
|
|
||||||
--
|
|
||||||
-- This user "pma" must be defined in config.inc.php (controluser/controlpass)
|
|
||||||
--
|
|
||||||
-- Please don't forget to set up the tablenames in config.inc.php
|
|
||||||
--
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Database : `phpmyadmin`
|
|
||||||
--
|
|
||||||
CREATE DATABASE IF NOT EXISTS `phpmyadmin`
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
USE phpmyadmin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Privileges
|
|
||||||
--
|
|
||||||
-- (activate this statement if necessary)
|
|
||||||
-- GRANT SELECT, INSERT, DELETE, UPDATE ON `phpmyadmin`.* TO
|
|
||||||
-- 'pma'@localhost;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__bookmark`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__bookmark` (
|
|
||||||
`id` int(11) NOT NULL auto_increment,
|
|
||||||
`dbase` varchar(255) NOT NULL default '',
|
|
||||||
`user` varchar(255) NOT NULL default '',
|
|
||||||
`label` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
|
|
||||||
`query` text NOT NULL,
|
|
||||||
PRIMARY KEY (`id`)
|
|
||||||
)
|
|
||||||
COMMENT='Bookmarks'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__column_info`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__column_info` (
|
|
||||||
`id` int(5) unsigned NOT NULL auto_increment,
|
|
||||||
`db_name` varchar(64) NOT NULL default '',
|
|
||||||
`table_name` varchar(64) NOT NULL default '',
|
|
||||||
`column_name` varchar(64) NOT NULL default '',
|
|
||||||
`comment` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
|
|
||||||
`mimetype` varchar(255) COLLATE utf8_general_ci NOT NULL default '',
|
|
||||||
`transformation` varchar(255) NOT NULL default '',
|
|
||||||
`transformation_options` varchar(255) NOT NULL default '',
|
|
||||||
PRIMARY KEY (`id`),
|
|
||||||
UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`)
|
|
||||||
)
|
|
||||||
COMMENT='Column information for phpMyAdmin'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__history`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__history` (
|
|
||||||
`id` bigint(20) unsigned NOT NULL auto_increment,
|
|
||||||
`username` varchar(64) NOT NULL default '',
|
|
||||||
`db` varchar(64) NOT NULL default '',
|
|
||||||
`table` varchar(64) NOT NULL default '',
|
|
||||||
`timevalue` timestamp NOT NULL,
|
|
||||||
`sqlquery` text NOT NULL,
|
|
||||||
PRIMARY KEY (`id`),
|
|
||||||
KEY `username` (`username`,`db`,`table`,`timevalue`)
|
|
||||||
)
|
|
||||||
COMMENT='SQL history for phpMyAdmin'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__pdf_pages`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__pdf_pages` (
|
|
||||||
`db_name` varchar(64) NOT NULL default '',
|
|
||||||
`page_nr` int(10) unsigned NOT NULL auto_increment,
|
|
||||||
`page_descr` varchar(50) COLLATE utf8_general_ci NOT NULL default '',
|
|
||||||
PRIMARY KEY (`page_nr`),
|
|
||||||
KEY `db_name` (`db_name`)
|
|
||||||
)
|
|
||||||
COMMENT='PDF relation pages for phpMyAdmin'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__recent`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__recent` (
|
|
||||||
`username` varchar(64) NOT NULL,
|
|
||||||
`tables` text NOT NULL,
|
|
||||||
PRIMARY KEY (`username`)
|
|
||||||
)
|
|
||||||
COMMENT='Recently accessed tables'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__table_uiprefs`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__table_uiprefs` (
|
|
||||||
`username` varchar(64) NOT NULL,
|
|
||||||
`db_name` varchar(64) NOT NULL,
|
|
||||||
`table_name` varchar(64) NOT NULL,
|
|
||||||
`prefs` text NOT NULL,
|
|
||||||
`last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
||||||
PRIMARY KEY (`username`,`db_name`,`table_name`)
|
|
||||||
)
|
|
||||||
COMMENT='Tables'' UI preferences'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__relation`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__relation` (
|
|
||||||
`master_db` varchar(64) NOT NULL default '',
|
|
||||||
`master_table` varchar(64) NOT NULL default '',
|
|
||||||
`master_field` varchar(64) NOT NULL default '',
|
|
||||||
`foreign_db` varchar(64) NOT NULL default '',
|
|
||||||
`foreign_table` varchar(64) NOT NULL default '',
|
|
||||||
`foreign_field` varchar(64) NOT NULL default '',
|
|
||||||
PRIMARY KEY (`master_db`,`master_table`,`master_field`),
|
|
||||||
KEY `foreign_field` (`foreign_db`,`foreign_table`)
|
|
||||||
)
|
|
||||||
COMMENT='Relation table'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__table_coords`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__table_coords` (
|
|
||||||
`db_name` varchar(64) NOT NULL default '',
|
|
||||||
`table_name` varchar(64) NOT NULL default '',
|
|
||||||
`pdf_page_number` int(11) NOT NULL default '0',
|
|
||||||
`x` float unsigned NOT NULL default '0',
|
|
||||||
`y` float unsigned NOT NULL default '0',
|
|
||||||
PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`)
|
|
||||||
)
|
|
||||||
COMMENT='Table coordinates for phpMyAdmin PDF output'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__table_info`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__table_info` (
|
|
||||||
`db_name` varchar(64) NOT NULL default '',
|
|
||||||
`table_name` varchar(64) NOT NULL default '',
|
|
||||||
`display_field` varchar(64) NOT NULL default '',
|
|
||||||
PRIMARY KEY (`db_name`,`table_name`)
|
|
||||||
)
|
|
||||||
COMMENT='Table information for phpMyAdmin'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__designer_coords`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__designer_coords` (
|
|
||||||
`db_name` varchar(64) NOT NULL default '',
|
|
||||||
`table_name` varchar(64) NOT NULL default '',
|
|
||||||
`x` INT,
|
|
||||||
`y` INT,
|
|
||||||
`v` TINYINT,
|
|
||||||
`h` TINYINT,
|
|
||||||
PRIMARY KEY (`db_name`,`table_name`)
|
|
||||||
)
|
|
||||||
COMMENT='Table coordinates for Designer'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__tracking`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__tracking` (
|
|
||||||
`db_name` varchar(64) NOT NULL,
|
|
||||||
`table_name` varchar(64) NOT NULL,
|
|
||||||
`version` int(10) unsigned NOT NULL,
|
|
||||||
`date_created` datetime NOT NULL,
|
|
||||||
`date_updated` datetime NOT NULL,
|
|
||||||
`schema_snapshot` text NOT NULL,
|
|
||||||
`schema_sql` text,
|
|
||||||
`data_sql` longtext,
|
|
||||||
`tracking` set('UPDATE','REPLACE','INSERT','DELETE','TRUNCATE','CREATE DATABASE','ALTER DATABASE','DROP DATABASE','CREATE TABLE','ALTER TABLE','RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX','CREATE VIEW','ALTER VIEW','DROP VIEW') default NULL,
|
|
||||||
`tracking_active` int(1) unsigned NOT NULL default '1',
|
|
||||||
PRIMARY KEY (`db_name`,`table_name`,`version`)
|
|
||||||
)
|
|
||||||
COMMENT='Database changes tracking for phpMyAdmin'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__userconfig`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__userconfig` (
|
|
||||||
`username` varchar(64) NOT NULL,
|
|
||||||
`timevalue` timestamp NOT NULL,
|
|
||||||
`config_data` text NOT NULL,
|
|
||||||
PRIMARY KEY (`username`)
|
|
||||||
)
|
|
||||||
COMMENT='User preferences storage for phpMyAdmin'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__users`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__users` (
|
|
||||||
`username` varchar(64) NOT NULL,
|
|
||||||
`usergroup` varchar(64) NOT NULL,
|
|
||||||
PRIMARY KEY (`username`,`usergroup`)
|
|
||||||
)
|
|
||||||
COMMENT='Users and their assignments to user groups'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__usergroups`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__usergroups` (
|
|
||||||
`usergroup` varchar(64) NOT NULL,
|
|
||||||
`tab` varchar(64) NOT NULL,
|
|
||||||
`allowed` enum('Y','N') NOT NULL DEFAULT 'N',
|
|
||||||
PRIMARY KEY (`usergroup`,`tab`,`allowed`)
|
|
||||||
)
|
|
||||||
COMMENT='User groups with configured menu items'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__navigationhiding`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__navigationhiding` (
|
|
||||||
`username` varchar(64) NOT NULL,
|
|
||||||
`item_name` varchar(64) NOT NULL,
|
|
||||||
`item_type` varchar(64) NOT NULL,
|
|
||||||
`db_name` varchar(64) NOT NULL,
|
|
||||||
`table_name` varchar(64) NOT NULL,
|
|
||||||
PRIMARY KEY (`username`,`item_name`,`item_type`,`db_name`,`table_name`)
|
|
||||||
)
|
|
||||||
COMMENT='Hidden items of navigation tree'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
-- --------------------------------------------------------
|
|
||||||
|
|
||||||
--
|
|
||||||
-- Table structure for table `pma__savedsearches`
|
|
||||||
--
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS `pma__savedsearches` (
|
|
||||||
`id` int(5) unsigned NOT NULL auto_increment,
|
|
||||||
`username` varchar(64) NOT NULL default '',
|
|
||||||
`db_name` varchar(64) NOT NULL default '',
|
|
||||||
`search_name` varchar(64) NOT NULL default '',
|
|
||||||
`search_data` text NOT NULL,
|
|
||||||
PRIMARY KEY (`id`),
|
|
||||||
UNIQUE KEY `u_savedsearches_username_dbname` (`username`,`db_name`,`search_name`)
|
|
||||||
)
|
|
||||||
COMMENT='Saved searches'
|
|
||||||
DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
|
|
||||||
|
|
||||||
|
|
@ -37,8 +37,7 @@ cookie_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-
|
||||||
sed -i "s@YNH_PMA_USER@$db_user@g" ../conf/create_db.sql
|
sed -i "s@YNH_PMA_USER@$db_user@g" ../conf/create_db.sql
|
||||||
sudo yunohost app initdb $db_user -p $db_pwd
|
sudo yunohost app initdb $db_user -p $db_pwd
|
||||||
mysql -u root -p$(sudo cat /etc/yunohost/mysql) < ../conf/create_db.sql
|
mysql -u root -p$(sudo cat /etc/yunohost/mysql) < ../conf/create_db.sql
|
||||||
mysql -u $db_user -p$db_pwd < ../conf/create_tables.sql
|
mysql -u $db_user -p$db_pwd < $final_path/examples/create_tables.sql
|
||||||
# mysql -u root -p$(sudo cat /etc/yunohost/mysql) < ../conf/create_tables.sql
|
|
||||||
sudo yunohost app setting phpmyadmin mysqlpwd -v $db_pwd
|
sudo yunohost app setting phpmyadmin mysqlpwd -v $db_pwd
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,8 @@ db_user=phpmyadmin
|
||||||
db_pwd=$(sudo yunohost app setting phpmyadmin mysqlpwd)
|
db_pwd=$(sudo yunohost app setting phpmyadmin mysqlpwd)
|
||||||
|
|
||||||
# Update tables
|
# Update tables
|
||||||
mysql -u $db_user -p$db_pwd < ../conf/create_tables.sql
|
mysql -u $db_user -p$db_pwd < $final_path/examples/upgrade_column_info_4_3_0+.sql
|
||||||
|
mysql -u $db_user -p$db_pwd < $final_path/examples/create_tables.sql
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
echo "Configuring application..."
|
echo "Configuring application..."
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
4.2.13.1
|
4.3.7
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue