Fixed a bug which happened while upgrading the SpamX plugin

Geeklog-Core · Nov 1, 2019 · 2c62977 · 2c62977
1 parent 4c5f939
commit 2c62977
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/plugins/spamx/sql/mysql_updates.php b/plugins/spamx/sql/mysql_updates.php
@@ -57,13 +57,13 @@
 
     '1.3.2' => array(
         "ALTER TABLE {$_TABLES['spamx']} MODIFY COLUMN regdate DATETIME DEFAULT NULL",
-        "DROP INDEX `primary` ON {$_TABLES['spamx']}",
+        "ALTER TABLE {$_TABLES['spamx']} DROP PRIMARY  KEY",
         "DROP INDEX `spamx_name` ON {$_TABLES['spamx']}",
         "ALTER TABLE {$_TABLES['spamx']} ADD PRIMARY KEY (name)"
     ),
 
     '1.3.3' => array(
-        "DROP INDEX `primary` ON {$_TABLES['spamx']}",
+        "ALTER TABLE {$_TABLES['spamx']} DROP PRIMARY  KEY",
         "ALTER TABLE {$_TABLES['spamx']} MODIFY COLUMN `value` VARCHAR(191)",
         "ALTER TABLE {$_TABLES['spamx']} ADD PRIMARY KEY (name, value)"
     )    

diff --git a/plugins/spamx/sql/pgsql_updates.php b/plugins/spamx/sql/pgsql_updates.php
@@ -53,15 +53,15 @@
 
     '1.3.2' => array(
         "ALTER TABLE {$_TABLES['spamx']} MODIFY COLUMN regdate DATETIME DEFAULT NULL",
-        "DROP INDEX `primary` ON {$_TABLES['spamx']}",
+        "ALTER TABLE {$_TABLES['spamx']} DROP CONSTRAINT {$_TABLES['spamx']}_pkey",
         "DROP INDEX `spamx_name` ON {$_TABLES['spamx']}",
-        "ALTER TABLE {$_TABLES['spamx']} ADD PRIMARY KEY (name)"
+        "ALTER TABLE {$_TABLES['spamx']} ADD CONSTRAINT {$_TABLES['spamx']}_pkey PRIMARY KEY (name)"
     ),
 
     '1.3.3' => array(
-        "DROP INDEX `primary` ON {$_TABLES['spamx']}",
+        "ALTER TABLE {$_TABLES['spamx']} DROP CONSTRAINT {$_TABLES['spamx']}_pkey",
         "ALTER TABLE {$_TABLES['spamx']} MODIFY COLUMN `value` VARCHAR(191)",
-        "ALTER TABLE {$_TABLES['spamx']} ADD PRIMARY KEY (name, value)"
+        "ALTER TABLE {$_TABLES['spamx']} ADD CONSTRAINT {$_TABLES['spamx']}_pkey PRIMARY KEY (name, value)"
     )   
 );
 

diff --git a/public_html/admin/install/devel-db-update.php b/public_html/admin/install/devel-db-update.php
@@ -363,7 +363,7 @@ function update_DatabaseFor213()
 
 
     // SpamX
-    $_SQL[] = "DROP INDEX `primary` ON {$_TABLES['spamx']}";
+    $_SQL[] = "ALTER TABLE {$_TABLES['spamx']} DROP PRIMARY KEY";
     $_SQL[] = "ALTER TABLE {$_TABLES['spamx']} MODIFY COLUMN `value` VARCHAR(191)";
     $_SQL[] = "ALTER TABLE {$_TABLES['spamx']} ADD PRIMARY KEY (name, value)";
     $_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version='1.3.4' WHERE pi_name='spamx'";
@@ -495,7 +495,7 @@ function update_DatabaseFor212()
 
     // SpamX
     $_SQL[] = "ALTER TABLE {$_TABLES['spamx']} MODIFY COLUMN regdate DATETIME DEFAULT NULL";
-    $_SQL[] = "DROP INDEX `primary` ON {$_TABLES['spamx']}";
+    $_SQL[] = "ALTER TABLE {$_TABLES['spamx']} DROP PRIMARY KEY";
     $_SQL[] = "DROP INDEX `spamx_name` ON {$_TABLES['spamx']}";
     $_SQL[] = "ALTER TABLE {$_TABLES['spamx']} ADD PRIMARY KEY (name)";
     $_SQL[] = "UPDATE {$_TABLES['plugins']} SET pi_version='1.3.3', pi_gl_version='". VERSION ."', pi_homepage='https://www.geeklog.net' WHERE pi_name='spamx'";