Changeset 1595

Timestamp:

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

Author:

saxmatt

Message:

Remove optiontypes table.

Location:

trunk

Files:

• wp-admin/install.php (modified) (2 diffs)
• wp-admin/upgrade-functions.php (modified) (4 diffs)
• wp-settings.php (modified) (2 diffs)

trunk/wp-admin/install.php

@@ -343 +343 @@
 $q = $wpdb->query($query);
 
-// $query = "DROP TABLE IF EXISTS $tableoptiontypes";
-// $q = mysql_query($query) or mysql_doh("doh, can't drop the table \"$tableoptiontypes\" in the database.");
-
-$query = "
-CREATE TABLE $wpdb->optiontypes (
-  optiontype_id int(11) NOT NULL auto_increment,
-  optiontype_name varchar(64) NOT NULL,
-  PRIMARY KEY (optiontype_id)
-)
-";
-$q = $wpdb->query($query);
-
-
-// $query = "DROP TABLE IF EXISTS $tableoptiongroups";
-// $q = mysql_query($query) or mysql_doh("doh, can't drop the table \"$tableoptiongroups\" in the database.");
-
 $query = "
 CREATE TABLE $wpdb->optiongroups (
@@ -385 +369 @@
 
 $option_data = array(
-"INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (1, 'integer')",
-"INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (2, 'boolean')",
-"INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (3, 'string')",
-"INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (4, 'date')",
-"INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (5, 'select')",
-"INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (6, 'range')",
-"INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (7, 'sqlselect')",
-"INSERT INTO $wpdb->optiontypes (optiontype_id, optiontype_name) VALUES (8, 'float')",
-
 //base options from b2cofig
 "INSERT INTO $wpdb->options (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(1,'siteurl', 3, '$guessurl', 'siteurl is your blog\'s URL: for example, \'http://example.com/wordpress\' (no trailing slash !)', 8, 30)",

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');
 }
 

trunk/wp-settings.php

@@ -26 +26 @@
 $wpdb->linkcategories      = $table_prefix . 'linkcategories';
 $wpdb->options             = $table_prefix . 'options';
-$wpdb->optiontypes         = $table_prefix . 'optiontypes';
 $wpdb->optiongroups        = $table_prefix . 'optiongroups';
 $wpdb->optiongroup_options = $table_prefix . 'optiongroup_options';
@@ -41 +40 @@
 $tablelinkcategories = $wpdb->linkcategories;
 $tableoptions = $wpdb->options;
-$tableoptiontypes = $wpdb->optiontypes;
 $tableoptiongroups = $wpdb->optiongroups;
 $tableoptiongroup_options = $wpdb->optiongroup_options;