Changeset 1595 for trunk/wp-admin/upgrade-functions.php

Timestamp:

09/04/2004 10:04:19 PM (21 years ago)

Author:

saxmatt

Message:

Remove optiontypes table.

File:

• trunk/wp-admin/upgrade-functions.php (modified) (4 diffs)

trunk/wp-admin/upgrade-functions.php

@@ -93 +93 @@
   PRIMARY KEY  (option_id,blog_id,option_name)
 );
-CREATE TABLE $wpdb->optiontypes (
-  optiontype_id int(11) NOT NULL auto_increment,
-  optiontype_name varchar(64) NOT NULL default '',
-  PRIMARY KEY  (optiontype_id)
-);
 CREATE TABLE $wpdb->post2cat (
   rel_id int(11) NOT NULL auto_increment,
@@ -223 +218 @@
     )
     ");
-    maybe_create_table($wpdb->optiontypes, "
-    CREATE TABLE $wpdb->optiontypes (
-      optiontype_id int(11) NOT NULL auto_increment,
-      optiontype_name varchar(64) NOT NULL,
-      PRIMARY KEY (optiontype_id)
-    )
-    ");
     maybe_create_table($wpdb->optiongroups, "
     CREATE TABLE $wpdb->optiongroups (
@@ -247 +235 @@
     )
     ");
-    
-    // TODO: REWRITE THIS
-    $option_types = array(
-        "1" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('1', 'integer')",
-        "2" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('2', 'boolean')",
-        "3" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('3', 'string')",
-        "4" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('4', 'date')",
-        "5" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('5', 'select')",
-        "6" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('6', 'range')",
-        "7" => "INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES ('7', 'sqlselect')");
-
-    foreach ($option_types as $option_id => $query) {
-        if(!$wpdb->get_var("SELECT * FROM $wpdb->optiontypes WHERE optiontype_id = '$option_id'")) {
-            $wpdb->query($query);
-        }
-    }
 
     // Guess a site URI
@@ -904 +876 @@
     }
 
+    // Obsolete tables
     $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optionvalues');
+    $wpdb->query('DROP TABLE IF EXISTS ' . $table_prefix . 'optiontypes');
 }