Moving attributes from Datasource to DboDataSource.

cakephp · Feb 25, 2011 · 6e14fa8 · 6e14fa8
1 parent f155440
commit 6e14fa8
Show file tree

Hide file tree

Showing 2 changed files with 122 additions and 122 deletions.
diff --git a/cake/libs/model/datasources/datasource.php b/cake/libs/model/datasources/datasource.php
@@ -32,112 +32,6 @@ class DataSource extends Object {
  */
 	public $connected = false;
 
-/**
- * Print full query debug info?
- *
- * @var boolean
- * @access public
- */
-	public $fullDebug = false;
-
-/**
- * Error description of last query
- *
- * @var unknown_type
- * @access public
- */
-	public $error = null;
-
-/**
- * String to hold how many rows were affected by the last SQL operation.
- *
- * @var string
- * @access public
- */
-	public $affected = null;
-
-/**
- * Number of rows in current resultset
- *
- * @var int
- * @access public
- */
-	public $numRows = null;
-
-/**
- * Time the last query took
- *
- * @var int
- * @access public
- */
-	public $took = null;
-
-/**
- * The starting character that this DataSource uses for quoted identifiers.
- *
- * @var string
- * @access public
- */
-	public $startQuote = null;
-
-/**
- * The ending character that this DataSource uses for quoted identifiers.
- *
- * @var string
- * @access public
- */
-	public $endQuote = null;
-
-/**
- * Result
- *
- * @var array
- * @access protected
- */
-	protected $_result = null;
-
-/**
- * Queries count.
- *
- * @var int
- * @access protected
- */
-	protected $_queriesCnt = 0;
-
-/**
- * Total duration of all queries.
- *
- * @var unknown_type
- * @access protected
- */
-	protected $_queriesTime = null;
-
-/**
- * Log of queries executed by this DataSource
- *
- * @var unknown_type
- * @access protected
- */
-	protected $_queriesLog = array();
-
-/**
- * Maximum number of items in query log
- *
- * This is to prevent query log taking over too much memory.
- *
- * @var int Maximum number of queries in the queries log.
- * @access protected
- */
-	protected $_queriesLogMax = 200;
-
-/**
- * Caches serialzed results of executed queries
- *
- * @var array Maximum number of queries in the queries log.
- * @access protected
- */
-	protected $_queryCache = array();
-
 /**
  * The default configuration of a specific DataSource
  *
@@ -162,14 +56,6 @@ class DataSource extends Object {
  */
 	protected $_sources = null;
 
-/**
- * A reference to the physical connection of this DataSource
- *
- * @var array
- * @access public
- */
-	public $connection = null;
-
 /**
  * The DataSource configuration
  *
@@ -178,14 +64,6 @@ class DataSource extends Object {
  */
 	public $config = array();
 
-/**
- * The DataSource configuration key name
- *
- * @var string
- * @access public
- */
-	public $configKeyName = null;
-
 /**
  * Whether or not this DataSource is in the middle of a transaction
  *

diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
@@ -70,6 +70,128 @@ class DboSource extends DataSource {
  */
 	public $cacheMethods = true ;
 
+/**
+ * Print full query debug info?
+ *
+ * @var boolean
+ * @access public
+ */
+	public $fullDebug = false;
+
+/**
+ * Error description of last query
+ *
+ * @var unknown_type
+ * @access public
+ */
+	public $error = null;
+
+/**
+ * String to hold how many rows were affected by the last SQL operation.
+ *
+ * @var string
+ * @access public
+ */
+	public $affected = null;
+
+/**
+ * Number of rows in current resultset
+ *
+ * @var int
+ * @access public
+ */
+	public $numRows = null;
+
+/**
+ * Time the last query took
+ *
+ * @var int
+ * @access public
+ */
+	public $took = null;
+
+/**
+ * Result
+ *
+ * @var array
+ * @access protected
+ */
+	protected $_result = null;
+
+/**
+ * Queries count.
+ *
+ * @var int
+ * @access protected
+ */
+	protected $_queriesCnt = 0;
+
+/**
+ * Total duration of all queries.
+ *
+ * @var unknown_type
+ * @access protected
+ */
+	protected $_queriesTime = null;
+
+/**
+ * Log of queries executed by this DataSource
+ *
+ * @var unknown_type
+ * @access protected
+ */
+	protected $_queriesLog = array();
+
+/**
+ * Maximum number of items in query log
+ *
+ * This is to prevent query log taking over too much memory.
+ *
+ * @var int Maximum number of queries in the queries log.
+ * @access protected
+ */
+	protected $_queriesLogMax = 200;
+
+/**
+ * Caches serialzed results of executed queries
+ *
+ * @var array Maximum number of queries in the queries log.
+ * @access protected
+ */
+	protected $_queryCache = array();
+
+/**
+ * A reference to the physical connection of this DataSource
+ *
+ * @var array
+ * @access public
+ */
+	public $connection = null;
+
+/**
+ * The DataSource configuration key name
+ *
+ * @var string
+ * @access public
+ */
+	public $configKeyName = null;
+
+/**
+ * The starting character that this DataSource uses for quoted identifiers.
+ *
+ * @var string
+ * @access public
+ */
+	public $startQuote = null;
+
+/**
+ * The ending character that this DataSource uses for quoted identifiers.
+ *
+ * @var string
+ * @access public
+ */
+	public $endQuote = null;
+
 /**
  * Bypass automatic adding of joined fields/associations.
  *