[livejournal] r17746: LJSUP-7052.

U   trunk/bin/upgrading/update-db-general.pl

Modified: trunk/bin/upgrading/update-db-general.pl
===================================================================
--- trunk/bin/upgrading/update-db-general.pl	2010-11-23 03:13:11 UTC (rev 17745)
+++ trunk/bin/upgrading/update-db-general.pl	2010-11-23 03:25:41 UTC (rev 17746)
@@ -4320,10 +4320,12 @@
                     ADD remove_after INT NOT NULL");
     }
 
-    unless (column_type("vertical2", "kw_id")) {
-        do_alter("ALTER TABLE vertical_keywords DROP PRIMARY KEY, DROP INDEX vert_id, DROP INDEX keyword, DROP journalid, DROP jitemid, DROP vert_id, DROP is_seo, ADD kw_id INT NOT NULL");
+    unless (column_type("vertical_keywords", "kw_id")) {
+        do_alter("vertical_keywords",
+            "ALTER TABLE vertical_keywords DROP PRIMARY KEY, DROP INDEX vert_id, DROP INDEX keyword, DROP journalid, DROP jitemid, DROP vert_id, DROP is_seo, ADD kw_id INT NOT NULL");
         do_sql("TRUNCATE vertical_keywords");
-        do_alter("ALTER TABLE vertical_keywords ADD PRIMARY KEY(kw_id), ADD UNIQUE(keyword), MODIFY kw_id INT NOT NULL AUTO_INCREMENT");
+        do_alter("vertical_keywords",
+            "ALTER TABLE vertical_keywords ADD PRIMARY KEY(kw_id), ADD UNIQUE(keyword), MODIFY kw_id INT NOT NULL AUTO_INCREMENT");
     }
 
 });