diff --git a/dr.botzo.py b/dr.botzo.py index 01572da..164e0e6 100644 --- a/dr.botzo.py +++ b/dr.botzo.py @@ -74,7 +74,7 @@ try: CREATE TABLE IF NOT EXISTS drbotzo_modules ( module VARCHAR(64) PRIMARY KEY, version INTEGER - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin """ cur.execute(query) db.commit() diff --git a/modules/Achievements.py b/modules/Achievements.py index 70fafc8..8ce9126 100644 --- a/modules/Achievements.py +++ b/modules/Achievements.py @@ -82,7 +82,7 @@ class Achievements(Module): userhost VARCHAR(256) NOT NULL DEFAULT '', is_playing INTEGER NOT NULL DEFAULT 0, last_seen_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE achievements_event ( @@ -93,7 +93,7 @@ class Achievements(Module): msg_len INTEGER, event_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY(player_id) REFERENCES achievements_player(id) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE achievements_achievement ( @@ -101,7 +101,7 @@ class Achievements(Module): name VARCHAR(256) NOT NULL, description VARCHAR(256) NOT NULL, query VARCHAR(1024) NOT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE achievements_log ( @@ -111,18 +111,18 @@ class Achievements(Module): event_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY(player_id) REFERENCES achievements_player(id), FOREIGN KEY(achievement_id) REFERENCES achievements_achievement(id) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE achievements_config ( channel TEXT NOT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE achievements_filter ( id SERIAL, filter VARCHAR(256) NOT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE achievements_filter_log ( @@ -131,7 +131,7 @@ class Achievements(Module): event_id BIGINT(20) UNSIGNED NOT NULL, FOREIGN KEY(filter_id) REFERENCES achievements_filter(id), FOREIGN KEY(event_id) REFERENCES achievements_event(id) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') db.commit() self.db_register_module_version(self.__class__.__name__, version) diff --git a/modules/Facts.py b/modules/Facts.py index f4bb95b..2ed865c 100644 --- a/modules/Facts.py +++ b/modules/Facts.py @@ -57,7 +57,7 @@ class Facts(Module): who VARCHAR(64) NOT NULL, userhost VARCHAR(256) NOT NULL, time TIMESTAMP DEFAULT CURRENT_TIMESTAMP - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') db.commit() self.db_register_module_version(self.__class__.__name__, version) diff --git a/modules/Karma.py b/modules/Karma.py index 467d263..c9c824b 100644 --- a/modules/Karma.py +++ b/modules/Karma.py @@ -64,7 +64,7 @@ class Karma(Module): who VARCHAR(64) NOT NULL, userhost VARCHAR(256) NOT NULL, karmatime TIMESTAMP DEFAULT CURRENT_TIMESTAMP - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute('CREATE INDEX karma_log_key_ix ON karma_log (karma_key)') cur.execute('CREATE INDEX karma_log_who_ix ON karma_log (who)') diff --git a/modules/Markov.py b/modules/Markov.py index ffa68f8..3f5f0e5 100644 --- a/modules/Markov.py +++ b/modules/Markov.py @@ -87,13 +87,13 @@ class Markov(Module): id SERIAL, target VARCHAR(256) NOT NULL, chance INTEGER NOT NULL DEFAULT 99999 - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE markov_context ( id SERIAL, context VARCHAR(256) NOT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE markov_target_to_context_map ( @@ -101,7 +101,7 @@ class Markov(Module): target VARCHAR(256) NOT NULL, context_id BIGINT(20) UNSIGNED NOT NULL, FOREIGN KEY(context_id) REFERENCES markov_context(id) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE markov_chain ( @@ -111,7 +111,7 @@ class Markov(Module): v VARCHAR(128) NOT NULL, context_id BIGINT(20) UNSIGNED NOT NULL, FOREIGN KEY(context_id) REFERENCES markov_context(id) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE INDEX markov_chain_keys_and_context_id_index diff --git a/modules/Pi.py b/modules/Pi.py index 04e400e..d10c843 100644 --- a/modules/Pi.py +++ b/modules/Pi.py @@ -55,7 +55,7 @@ class Pi(Module): count_inside INTEGER NOT NULL, count_total INTEGER NOT NULL, time TIMESTAMP DEFAULT CURRENT_TIMESTAMP - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE VIEW pi_latest_pi AS diff --git a/modules/Seen.py b/modules/Seen.py index d18465d..f15433e 100644 --- a/modules/Seen.py +++ b/modules/Seen.py @@ -46,7 +46,7 @@ class Seen(Module): host VARCHAR(256) NOT NULL, time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, what LONGTEXT NOT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE UNIQUE INDEX seen_nicks_nick_and_location_index diff --git a/modules/Storycraft.py b/modules/Storycraft.py index b7fa362..895aa36 100644 --- a/modules/Storycraft.py +++ b/modules/Storycraft.py @@ -113,7 +113,7 @@ class Storycraft(Module): default_line_length INTEGER NOT NULL, default_random_method INTEGER NOT NULL, default_lines_per_turn INTEGER NOT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' INSERT INTO storycraft_config @@ -135,7 +135,7 @@ class Storycraft(Module): owner_userhost VARCHAR(256) NOT NULL, start_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, end_time TIMESTAMP NULL DEFAULT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE storycraft_player ( @@ -144,7 +144,7 @@ class Storycraft(Module): nick VARCHAR(64) NOT NULL, userhost VARCHAR(256) NOT NULL, FOREIGN KEY(game_id) REFERENCES storycraft_game(id) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') cur.execute(''' CREATE TABLE storycraft_line ( @@ -155,7 +155,7 @@ class Storycraft(Module): time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY(game_id) REFERENCES storycraft_game(id), FOREIGN KEY(player_id) REFERENCES storycraft_player(id) - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin ''') db.commit() diff --git a/modules/Twitter.py b/modules/Twitter.py index 7031d26..4a14d0b 100644 --- a/modules/Twitter.py +++ b/modules/Twitter.py @@ -108,7 +108,7 @@ class Twitter(Module): output_channel VARCHAR(64) NOT NULL, oauth_token VARCHAR(256) DEFAULT NULL, oauth_token_secret VARCHAR(256) DEFAULT NULL - ) ENGINE=InnoDB DEFAULT CHARSET=utf8 + ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin """) cur.execute("""INSERT INTO twitter_settings (since_id, output_channel) VALUES (0, '#dr.botzo')""") db.commit()