From: Gunnar Beutner Date: Fri, 16 Aug 2013 23:15:22 +0000 (+0200) Subject: trusts: Fix db migration for PostgreSQL. X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/commitdiff_plain/ca6416b13c7925f13a7590f30a47cc55057f02cc trusts: Fix db migration for PostgreSQL. --- diff --git a/trusts/db-migration.c b/trusts/db-migration.c index e8bea9b3..a5f87960 100644 --- a/trusts/db-migration.c +++ b/trusts/db-migration.c @@ -107,9 +107,9 @@ static void tm_final(void *tag, int errcode) { trustsdb->squery(trustsdb, "BEGIN TRANSACTION", ""); trustsdb->squery(trustsdb, "DROP TABLE ?", "T", "groups"); - trustsdb->squery(trustsdb, "ALTER TABLE ? RENAME TO ?", "Ts", "migration_groups", "groups"); + trustsdb->squery(trustsdb, "ALTER TABLE ? RENAME TO groups", "T", "migration_groups"); trustsdb->squery(trustsdb, "DROP TABLE ?", "T", "hosts"); - trustsdb->squery(trustsdb, "ALTER TABLE ? RENAME TO ?", "Ts", "migration_hosts", "hosts"); + trustsdb->squery(trustsdb, "ALTER TABLE ? RENAME TO hosts", "T", "migration_hosts"); trustsdb->query(trustsdb, tm_complete, cbd, "COMMIT", ""); } } diff --git a/trusts/db-slave.c b/trusts/db-slave.c index 66561cc0..8d71b6d7 100644 --- a/trusts/db-slave.c +++ b/trusts/db-slave.c @@ -35,8 +35,8 @@ void trusts_replication_swap(void) { trustsdb->squery(trustsdb, "BEGIN TRANSACTION", ""); trustsdb->squery(trustsdb, "DROP TABLE ?", "T", "groups"); - trustsdb->squery(trustsdb, "ALTER TABLE ? RENAME TO ?", "Ts", "replication_groups", "groups"); + trustsdb->squery(trustsdb, "ALTER TABLE ? RENAME TO groups", "T", "replication_groups"); trustsdb->squery(trustsdb, "DROP TABLE ?", "T", "hosts"); - trustsdb->squery(trustsdb, "ALTER TABLE ? RENAME TO ?", "Ts", "replication_hosts", "hosts"); + trustsdb->squery(trustsdb, "ALTER TABLE ? RENAME TO hosts", "T", "replication_hosts"); trustsdb->query(trustsdb, tr_complete, NULL, "COMMIT", ""); }