From 385b4f1295698b5e44e78a54e755d4c0666948ca Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Wed, 24 Feb 2010 22:19:29 +0100 Subject: [PATCH] drop UNIQUE indices for (addr, port) when converting the database. --- pyweb/mumble/conversionsql/mysql/01-schema-prepare-mumble.sql | 4 ++++ pyweb/mumble/conversionsql/pgsql/01-schema-prepare-mumble.sql | 2 ++ pyweb/mumble/conversionsql/sqlite/01-schema-mumble.sql | 3 +-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pyweb/mumble/conversionsql/mysql/01-schema-prepare-mumble.sql b/pyweb/mumble/conversionsql/mysql/01-schema-prepare-mumble.sql index 0fe8c7d..f35ae9b 100644 --- a/pyweb/mumble/conversionsql/mysql/01-schema-prepare-mumble.sql +++ b/pyweb/mumble/conversionsql/mysql/01-schema-prepare-mumble.sql @@ -6,6 +6,10 @@ ALTER TABLE `mumble_mumble` ADD `display` varchar(200) AFTER `name`; COMMIT; +BEGIN; +ALTER TABLE mumble_mumble DROP KEY `addr`; +COMMIT; + BEGIN; CREATE INDEX `mumble_mumble_server_id_idx` ON `mumble_mumble` (`server_id`); diff --git a/pyweb/mumble/conversionsql/pgsql/01-schema-prepare-mumble.sql b/pyweb/mumble/conversionsql/pgsql/01-schema-prepare-mumble.sql index a3005ef..3f36233 100644 --- a/pyweb/mumble/conversionsql/pgsql/01-schema-prepare-mumble.sql +++ b/pyweb/mumble/conversionsql/pgsql/01-schema-prepare-mumble.sql @@ -5,3 +5,5 @@ ALTER TABLE "mumble_mumble" ADD "display" varchar(200); CREATE INDEX "mumble_mumble_server_id" ON "mumble_mumble" ("server_id"); + +ALTER TABLE "mumble_mumble" DROP CONSTRAINT "mumble_mumble_addr_key"; diff --git a/pyweb/mumble/conversionsql/sqlite/01-schema-mumble.sql b/pyweb/mumble/conversionsql/sqlite/01-schema-mumble.sql index 83faf0d..c69bdbe 100644 --- a/pyweb/mumble/conversionsql/sqlite/01-schema-mumble.sql +++ b/pyweb/mumble/conversionsql/sqlite/01-schema-mumble.sql @@ -6,6 +6,5 @@ CREATE TABLE "mumble_mumble_new" ( "addr" varchar(200) NOT NULL, "port" integer NOT NULL, "display" varchar(200) NOT NULL, - UNIQUE ("server_id", "srvid"), - UNIQUE ("addr", "port") + UNIQUE ("server_id", "srvid") );