Changeset 10910

Timestamp:

04/10/2009 09:56:30 PM (15 years ago)

Author:

ryan

Message:

Store field types in wpdb object. Props mdawaffe. see #7171

Location:

trunk

Files:

• wp-includes/wp-db.php (modified) (6 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/wp-db.php

@@ -254 +254 @@
     var $tables = array('users', 'usermeta', 'posts', 'categories', 'post2cat', 'comments', 'links', 'link2cat', 'options',
             'postmeta', 'terms', 'term_taxonomy', 'term_relationships');
+
+    /**
+     * Format specifiers for DB columns. Columns not listed here default to %s.  Initialized in wp-settings.php.
+     *
+     * Keys are colmn names, values are format types: 'ID' => '%d'
+     *
+     * @since 2.8.0
+     * @see wpdb:prepare()
+     * @see wpdb:insert()
+     * @see wpdb:update()
+     * @access public
+     * @war array
+     */
+    var $field_type = array();
 
     /**
@@ -704 +718 @@
      */
     function insert($table, $data, $format = null) {
-        global $db_field_types;
-
         $formats = $format = (array) $format;
         $fields = array_keys($data);
@@ -712 +724 @@
             if ( !empty($format) )
                 $form = ( $form = array_shift($formats) ) ? $form : $format[0];
-            elseif ( isset($db_field_types[$field]) )
-                $form = $db_field_types[$field];
+            elseif ( isset($this->field_types[$field]) )
+                $form = $this->field_types[$field];
             else
                 $form = '%s';
@@ -735 +747 @@
      */
     function update($table, $data, $where, $format = null, $where_format = null) {
-        global $db_field_types;
-
         if ( !is_array( $where ) )
             return false;
@@ -745 +755 @@
             if ( !empty($format) )
                 $form = ( $form = array_shift($formats) ) ? $form : $format[0];
-            elseif ( isset($db_field_types[$field]) )
-                $form = $db_field_types[$field];
+            elseif ( isset($this->field_types[$field]) )
+                $form = $this->field_types[$field];
             else
                 $form = '%s';
@@ -756 +766 @@
             if ( !empty($where_format) )
                 $form = ( $form = array_shift($where_formats) ) ? $form : $where_format[0];
-            elseif ( isset($db_field_types[$field]) )
-                $form = $db_field_types[$field];
+            elseif ( isset($this->field_types[$field]) )
+                $form = $this->field_types[$field];
             else
                 $form = '%s';

trunk/wp-settings.php

@@ -248 +248 @@
 require (ABSPATH . WPINC . '/classes.php');
 
+require_wp_db();
+
+if ( !empty($wpdb->error) )
+    dead_db();
+
 /**
  * Format specifiers for DB columns. Columns not listed here default to %s.
  * @since 2.8.0
- */
-$db_field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
+ * @see wpdb:$field_types
+ * @see wpdb:prepare()
+ * @see wpdb:insert()
+ * @see wpdb:update()
+ */
+$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
     'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'commment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
     'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
     'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d');
-
-require_wp_db();
-
-if ( !empty($wpdb->error) )
-    dead_db();
 
 $prefix = $wpdb->set_prefix($table_prefix);