diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-07 18:35:29 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-07 18:35:29 +0200 |
| commit | cb05801a9031254f5882038de07a3ee4d5f89dd0 (patch) | |
| tree | 186d9d1a4c591ec23e0e5bbebd08301143b5c157 /database.sql | |
| parent | 7308dbae282194356c2e95936aecc15ea059f356 (diff) | |
| parent | 0fa3b7f348c3deeb85cb5f5f9bd35ba47b0e92ee (diff) | |
| download | volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.gz volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.tar.bz2 volse-hubzilla-cb05801a9031254f5882038de07a3ee4d5f89dd0.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'database.sql')
| -rw-r--r--[-rwxr-xr-x] | database.sql | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/database.sql b/database.sql index a271e5491..010c63bb2 100755..100644 --- a/database.sql +++ b/database.sql @@ -34,10 +34,11 @@ CREATE TABLE IF NOT EXISTS `challenge` ( CREATE TABLE IF NOT EXISTS `config` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `cat` char(255) NOT NULL, - `k` char(255) NOT NULL, + `cat` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL, + `k` char(255) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL, `v` text NOT NULL, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + UNIQUE KEY `access`(`cat`,`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -542,9 +543,10 @@ INDEX ( `batch` ) CREATE TABLE IF NOT EXISTS `pconfig` ( `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , `uid` INT NOT NULL DEFAULT '0', -`cat` CHAR( 255 ) NOT NULL , -`k` CHAR( 255 ) NOT NULL , -`v` MEDIUMTEXT NOT NULL +`cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , +`k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL , +`v` MEDIUMTEXT NOT NULL, +UNIQUE KEY `access`(`cat`, `k`) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; |