diff --git a/ChangeLog b/ChangeLog index 381039789..ce955d70a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-07-15 Alexander M. Turek + * scripts/create_tables.old.sql, scripts/create_tables.sql: Force UTF-8 + for PMA database in MySQL 4.1 and above. + TODO: - Update docs + - Add conversion code to the docs + - add charset checks to pmadb validation code + 2004-07-15 Michal Čihař * tbl_properties_export.php: Fix export of queries with empty WHERE clause (bug #990330). diff --git a/scripts/create_tables.old.sql b/scripts/create_tables.old.sql new file mode 100644 index 000000000..c0deaba58 --- /dev/null +++ b/scripts/create_tables.old.sql @@ -0,0 +1,142 @@ +-- -------------------------------------------------------- +-- SQL Commands to set up the pmadb as described in Documentation.html. +-- +-- DON'T RUN THIS SCRIPT ON MySQL 4.1.2 AND ABOVE! +-- Instead, please run create_tables.sql. +-- +-- 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 +-- +-- $Id$ + +-- -------------------------------------------------------- + +-- +-- Database : `phpmyadmin` +-- +DROP DATABASE IF EXISTS `phpmyadmin`; +CREATE DATABASE `phpmyadmin`; +USE phpmyadmin; + +-- -------------------------------------------------------- + +-- +-- Privileges +-- +GRANT SELECT, INSERT, DELETE, UPDATE ON `phpmyadmin`.* TO + 'pma'@localhost; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma_bookmark` +-- + +CREATE TABLE `pma_bookmark` ( + `id` int(11) NOT NULL auto_increment, + `dbase` varchar(255) NOT NULL default '', + `user` varchar(255) NOT NULL default '', + `label` varchar(255) NOT NULL default '', + `query` text NOT NULL, + PRIMARY KEY (`id`) +) TYPE=MyISAM COMMENT='Bookmarks'; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma_column_info` +-- + +CREATE TABLE `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) NOT NULL default '', + `mimetype` varchar(255) 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`) +) TYPE=MyISAM COMMENT='Column information for phpMyAdmin'; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma_history` +-- + +CREATE TABLE `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(14) NOT NULL, + `sqlquery` text NOT NULL, + PRIMARY KEY (`id`), + KEY `username` (`username`,`db`,`table`,`timevalue`) +) TYPE=MyISAM COMMENT='SQL history for phpMyAdmin'; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma_pdf_pages` +-- + +CREATE TABLE `pma_pdf_pages` ( + `db_name` varchar(64) NOT NULL default '', + `page_nr` int(10) unsigned NOT NULL auto_increment, + `page_descr` varchar(50) NOT NULL default '', + PRIMARY KEY (`page_nr`), + KEY `db_name` (`db_name`) +) TYPE=MyISAM COMMENT='PDF relation pages for phpMyAdmin'; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma_relation` +-- + +CREATE TABLE `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`) +) TYPE=MyISAM COMMENT='Relation table'; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma_table_coords` +-- + +CREATE TABLE `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`) +) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output'; + +-- -------------------------------------------------------- + +-- +-- Table structure for table `pma_table_info` +-- + +CREATE TABLE `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`) +) TYPE=MyISAM COMMENT='Table information for phpMyAdmin'; diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index ba2ffb490..8235ba041 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -1,5 +1,12 @@ -- -------------------------------------------------------- -- SQL Commands to set up the pmadb as described in Documentation.html. +-- +-- This file is meant for use with MySQL 4.1.2 and above! +-- For older MySQL releases, please use create_tables.old.sql +-- +-- If you are running one MySQL 4.1.0 or 4.1.1, please create the tables using +-- create_tables.old.sql and upgrade their collation settings according to our +-- manual. -- -- 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 @@ -17,7 +24,8 @@ -- Database : `phpmyadmin` -- DROP DATABASE IF EXISTS `phpmyadmin`; -CREATE DATABASE `phpmyadmin`; +CREATE DATABASE `phpmyadmin` + DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; USE phpmyadmin; -- -------------------------------------------------------- @@ -41,7 +49,9 @@ CREATE TABLE `pma_bookmark` ( `label` varchar(255) NOT NULL default '', `query` text NOT NULL, PRIMARY KEY (`id`) -) TYPE=MyISAM COMMENT='Bookmarks'; +) + ENGINE=MyISAM COMMENT='Bookmarks' + DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; -- -------------------------------------------------------- @@ -60,7 +70,9 @@ CREATE TABLE `pma_column_info` ( `transformation_options` varchar(255) NOT NULL default '', PRIMARY KEY (`id`), UNIQUE KEY `db_name` (`db_name`,`table_name`,`column_name`) -) TYPE=MyISAM COMMENT='Column information for phpMyAdmin'; +) + ENGINE=MyISAM COMMENT='Column information for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; -- -------------------------------------------------------- @@ -77,7 +89,9 @@ CREATE TABLE `pma_history` ( `sqlquery` text NOT NULL, PRIMARY KEY (`id`), KEY `username` (`username`,`db`,`table`,`timevalue`) -) TYPE=MyISAM COMMENT='SQL history for phpMyAdmin'; +) + ENGINE=MyISAM COMMENT='SQL history for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; -- -------------------------------------------------------- @@ -91,7 +105,9 @@ CREATE TABLE `pma_pdf_pages` ( `page_descr` varchar(50) NOT NULL default '', PRIMARY KEY (`page_nr`), KEY `db_name` (`db_name`) -) TYPE=MyISAM COMMENT='PDF relation pages for phpMyAdmin'; +) + ENGINE=MyISAM COMMENT='PDF relation pages for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; -- -------------------------------------------------------- @@ -108,7 +124,9 @@ CREATE TABLE `pma_relation` ( `foreign_field` varchar(64) NOT NULL default '', PRIMARY KEY (`master_db`,`master_table`,`master_field`), KEY `foreign_field` (`foreign_db`,`foreign_table`) -) TYPE=MyISAM COMMENT='Relation table'; +) + ENGINE=MyISAM COMMENT='Relation table' + DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; -- -------------------------------------------------------- @@ -123,7 +141,9 @@ CREATE TABLE `pma_table_coords` ( `x` float unsigned NOT NULL default '0', `y` float unsigned NOT NULL default '0', PRIMARY KEY (`db_name`,`table_name`,`pdf_page_number`) -) TYPE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output'; +) + ENGINE=MyISAM COMMENT='Table coordinates for phpMyAdmin PDF output' + DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; -- -------------------------------------------------------- @@ -136,4 +156,6 @@ CREATE TABLE `pma_table_info` ( `table_name` varchar(64) NOT NULL default '', `display_field` varchar(64) NOT NULL default '', PRIMARY KEY (`db_name`,`table_name`) -) TYPE=MyISAM COMMENT='Table information for phpMyAdmin'; +) + ENGINE=MyISAM COMMENT='Table information for phpMyAdmin' + DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;