move method and added warning on count function

diff --git a/includes/DBDataObject.php b/includes/DBDataObject.php
index 25b653f..3fa5285 100644 (file)
--- a/includes/DBDataObject.php
+++ b/includes/DBDataObject.php
@@ -551,19 +551,6 @@ abstract class DBDataObject {
                $this->readDb = $db;
        }
 
-       /**
-        * Gets if the object can take a certain field.
-        *
-        * @since 1.20
-        *
-        * @param string $name
-        *
-        * @return boolean
-        */
-       public function canHaveField( $name ) {
-               return array_key_exists( $name, $this->table->getFieldTypes() );
-       }
-
        /**
         * Add an amount (can be negative) to the specified field (needs to be numeric).
         *

diff --git a/includes/DBTable.php b/includes/DBTable.php
index 70bbc0d..7d17b54 100644 (file)
--- a/includes/DBTable.php
+++ b/includes/DBTable.php
@@ -266,6 +266,9 @@ abstract class DBTable {
         * Returns the amount of matching records.
         * Condition field names get prefixed.
         *
+        * Note that this can be expensive on large tables.
+        * In such cases you might want to use DatabaseBase::estimateRowCount instead.
+        *
         * @since 1.20
         *
         * @param array $conditions
@@ -600,5 +603,18 @@ abstract class DBTable {
        public function getFieldNames() {
                return array_keys( $this->getFieldTypes() );
        }
+
+       /**
+        * Gets if the object can take a certain field.
+        *
+        * @since 1.20
+        *
+        * @param string $name
+        *
+        * @return boolean
+        */
+       public function canHaveField( $name ) {
+               return array_key_exists( $name, $this->getFieldTypes() );
+       }
        
 }