diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-07-02 05:37:18 +0300 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-07-02 18:34:02 +0300 |
| commit | 4ab83556c628e3c01f446252115f570776003afe (patch) | |
| tree | 70672585d855ea651ee3085816bdca4154cf6124 /sql | |
| parent | cc7d4c446e4ed6a9944a5c89ba37df83202d93a2 (diff) | |
Allow using templates created for other databases/tables
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/create_tables.sql | 11 | ||||
| -rw-r--r-- | sql/create_tables_drizzle.sql | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/sql/create_tables.sql b/sql/create_tables.sql index 4b78a16e46..2815ac8742 100644 --- a/sql/create_tables.sql +++ b/sql/create_tables.sql @@ -344,13 +344,12 @@ CREATE TABLE IF NOT EXISTS `pma__designer_settings` ( CREATE TABLE IF NOT EXISTS `pma__exporttemplates` ( `id` int(5) unsigned NOT NULL AUTO_INCREMENT, - `username` varchar(64) COLLATE utf8_bin NOT NULL, - `db_name` varchar(64) COLLATE utf8_bin DEFAULT NULL, - `table_name` varchar(64) COLLATE utf8_bin DEFAULT NULL, - `template_name` varchar(64) COLLATE utf8_bin NOT NULL, - `template_data` text COLLATE utf8_bin NOT NULL, + `username` varchar(64) NOT NULL, + `export_type` varchar(10) NOT NULL, + `template_name` varchar(64) NOT NULL, + `template_data` text NOT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `u_user_db_table_template` (`username`,`db_name`,`table_name`,`template_name`) + UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`) ) COMMENT='Saved export templates' DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; diff --git a/sql/create_tables_drizzle.sql b/sql/create_tables_drizzle.sql index c3264ab6fd..472e63c945 100644 --- a/sql/create_tables_drizzle.sql +++ b/sql/create_tables_drizzle.sql @@ -296,13 +296,12 @@ CREATE TABLE IF NOT EXISTS `pma__designer_settings` ( CREATE TABLE IF NOT EXISTS `pma__exporttemplates` ( `id` int(5) unsigned NOT NULL AUTO_INCREMENT, - `username` varchar(64) COLLATE utf8_bin NOT NULL, - `db_name` varchar(64) COLLATE utf8_bin DEFAULT NULL, - `table_name` varchar(64) COLLATE utf8_bin DEFAULT NULL, - `template_name` varchar(64) COLLATE utf8_bin NOT NULL, - `template_data` text COLLATE utf8_bin NOT NULL, + `username` varchar(64) NOT NULL, + `export_type` varchar(10) NOT NULL, + `template_name` varchar(64) NOT NULL, + `template_data` text NOT NULL, PRIMARY KEY (`id`), - UNIQUE KEY `u_user_db_table_template` (`username`,`db_name`,`table_name`,`template_name`) + UNIQUE KEY `u_user_type_template` (`username`,`export_type`,`template_name`) ) COMMENT='Saved export templates' COLLATE utf8_bin;
\ No newline at end of file |