Removed the parameter use in database drivers' _close() and added a default _close() method in CI_DB_driver + some changelog fixes

narfbg · narfbg · commit 79922c0d963d · 2012-05-23T12:27:17.000+03:00
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
@@ -1152,13 +1152,27 @@ public function close()
 	{
 		if ($this->conn_id)
 		{
-			$this->_close($this->conn_id);
+			$this->_close();
 			$this->conn_id = FALSE;
 		}
 	}
 
 	// --------------------------------------------------------------------
 
+	/**
+	 * Close DB Connection
+	 *
+	 * This method would be overriden by most of the drivers.
+	 *
+	 * @return	void
+	 */
+	protected function _close()
+	{
+		$this->conn_id = FALSE;
+	}
+
+	// --------------------------------------------------------------------
+
 	/**
 	 * Display an error message
 	 *
@@ -1401,7 +1415,7 @@ protected function _reset_select()
 	 */
 	public function __destruct()
 	{
-		if ($this->conn_id && ! $this->pconnect)
+		if ( ! $this->pconnect)
 		{
 			$this->close();
 		}
@@ -1410,4 +1424,4 @@ public function __destruct()
 }
 
 /* End of file DB_driver.php */
-/* Location: ./system/database/DB_driver.php */
+/* Location: ./system/database/DB_driver.php */
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
@@ -378,11 +378,10 @@ public function previous_row($type = 'object')
 	public function unbuffered_row($type = 'object')
 	{
 		return ($type !== 'array') ? $this->_fetch_object() : $this->_fetch_assoc();
-		
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * The following functions are normally overloaded by the identically named
 	 * methods in the platform-specific driver -- except when query caching
diff --git a/system/database/drivers/cubrid/cubrid_driver.php b/system/database/drivers/cubrid/cubrid_driver.php
@@ -485,7 +485,7 @@ protected function _update_batch($table, $values, $index, $where = NULL)
 	}
 
 	// --------------------------------------------------------------------
-	
+
 	/**
 	 * Limit string
 	 *
@@ -506,15 +506,14 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	resource
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
-		@cubrid_close($conn_id);
+		@cubrid_close($this->conn_id);
 	}
 
 }
 
 /* End of file cubrid_driver.php */
-/* Location: ./system/database/drivers/cubrid/cubrid_driver.php */
+/* Location: ./system/database/drivers/cubrid/cubrid_driver.php */
diff --git a/system/database/drivers/interbase/interbase_driver.php b/system/database/drivers/interbase/interbase_driver.php
@@ -472,12 +472,11 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	resource
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
-		@ibase_close($conn_id);
+		@ibase_close($this->conn_id);
 	}
 
 }
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
@@ -523,15 +523,14 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	resource
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
-		@mssql_close($conn_id);
+		@mssql_close($this->conn_id);
 	}
 
 }
 
 /* End of file mssql_driver.php */
-/* Location: ./system/database/drivers/mssql/mssql_driver.php */
+/* Location: ./system/database/drivers/mssql/mssql_driver.php */
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
@@ -520,15 +520,14 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	resource
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
-		@mysql_close($conn_id);
+		@mysql_close($this->conn_id);
 	}
 
 }
 
 /* End of file mysql_driver.php */
-/* Location: ./system/database/drivers/mysql/mysql_driver.php */
+/* Location: ./system/database/drivers/mysql/mysql_driver.php */
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
@@ -523,16 +523,14 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	object
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
 		$this->conn_id->close();
-		$this->conn_id = FALSE;
 	}
 
 }
 
 /* End of file mysqli_driver.php */
-/* Location: ./system/database/drivers/mysqli/mysqli_driver.php */
+/* Location: ./system/database/drivers/mysqli/mysqli_driver.php */
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
@@ -671,15 +671,14 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	resource
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
-		@oci_close($conn_id);
+		@oci_close($this->conn_id);
 	}
 
 }
 
 /* End of file oci8_driver.php */
-/* Location: ./system/database/drivers/oci8/oci8_driver.php */
+/* Location: ./system/database/drivers/oci8/oci8_driver.php */
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
@@ -402,15 +402,14 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	resource
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
-		@odbc_close($conn_id);
+		@odbc_close($this->conn_id);
 	}
 
 }
 
 /* End of file odbc_driver.php */
-/* Location: ./system/database/drivers/odbc/odbc_driver.php */
+/* Location: ./system/database/drivers/odbc/odbc_driver.php */
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php
@@ -667,20 +667,7 @@ protected function _limit($sql, $limit, $offset)
 		}
 	}
 
-	// --------------------------------------------------------------------
-
-	/**
-	 * Close DB Connection
-	 *
-	 * @param	object
-	 * @return	void
-	 */
-	protected function _close($conn_id)
-	{
-		$this->conn_id = NULL;
-	}
-
 }
 
 /* End of file pdo_driver.php */
-/* Location: ./system/database/drivers/pdo/pdo_driver.php */
+/* Location: ./system/database/drivers/pdo/pdo_driver.php */
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
@@ -653,12 +653,11 @@ protected function _where($key, $value = NULL, $type = 'AND ', $escape = NULL)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	resource
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
-		@pg_close($conn_id);
+		@pg_close($this->conn_id);
 	}
 
 }
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
@@ -450,15 +450,14 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	resource
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
-		@sqlite_close($conn_id);
+		@sqlite_close($this->conn_id);
 	}
 
 }
 
 /* End of file sqlite_driver.php */
-/* Location: ./system/database/drivers/sqlite/sqlite_driver.php */
+/* Location: ./system/database/drivers/sqlite/sqlite_driver.php */
diff --git a/system/database/drivers/sqlite3/sqlite3_driver.php b/system/database/drivers/sqlite3/sqlite3_driver.php
@@ -417,10 +417,9 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	object (ignored)
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
 		$this->conn_id->close();
 	}
diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php
@@ -510,15 +510,14 @@ protected function _limit($sql, $limit, $offset)
 	/**
 	 * Close DB Connection
 	 *
-	 * @param	resource
 	 * @return	void
 	 */
-	protected function _close($conn_id)
+	protected function _close()
 	{
-		@sqlsrv_close($conn_id);
+		@sqlsrv_close($this->conn_id);
 	}
 
 }
 
 /* End of file sqlsrv_driver.php */
-/* Location: ./system/database/drivers/sqlsrv/sqlsrv_driver.php */
+/* Location: ./system/database/drivers/sqlsrv/sqlsrv_driver.php */
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst

Original file line number	Diff line number	Diff line change
`@@ -1152,13 +1152,27 @@ public function close()`
`1152`	`1152`	`{`
`1153`	`1153`	`if ($this->conn_id)`
`1154`	`1154`	`{`
`1155`		`- $this->_close($this->conn_id);`
	`1155`	`+ $this->_close();`
`1156`	`1156`	`$this->conn_id = FALSE;`
`1157`	`1157`	`}`
`1158`	`1158`	`}`
`1159`	`1159`
`1160`	`1160`	`// --------------------------------------------------------------------`
`1161`	`1161`
	`1162`	`+ /**`
	`1163`	`+ * Close DB Connection`
	`1164`	`+ *`
	`1165`	`+ * This method would be overriden by most of the drivers.`
	`1166`	`+ *`
	`1167`	`+ * @return void`
	`1168`	`+ */`
	`1169`	`+ protected function _close()`
	`1170`	`+ {`
	`1171`	`+ $this->conn_id = FALSE;`
	`1172`	`+ }`
	`1173`	`+`
	`1174`	`+ // --------------------------------------------------------------------`
	`1175`	`+`
`1162`	`1176`	`/**`
`1163`	`1177`	`* Display an error message`
`1164`	`1178`	`*`
`@@ -1401,7 +1415,7 @@ protected function _reset_select()`
`1401`	`1415`	`*/`
`1402`	`1416`	`public function __destruct()`
`1403`	`1417`	`{`
`1404`		`- if ($this->conn_id && ! $this->pconnect)`
	`1418`	`+ if ( ! $this->pconnect)`
`1405`	`1419`	`{`
`1406`	`1420`	`$this->close();`
`1407`	`1421`	`}`
`@@ -1410,4 +1424,4 @@ public function __destruct()`
`1410`	`1424`	`}`
`1411`	`1425`
`1412`	`1426`	`/* End of file DB_driver.php */`
`1413`		`-/* Location: ./system/database/DB_driver.php */`
	`1427`	`+/* Location: ./system/database/DB_driver.php */`
Original file line number	Diff line number	Diff line change
`@@ -378,11 +378,10 @@ public function previous_row($type = 'object')`
`378`	`378`	`public function unbuffered_row($type = 'object')`
`379`	`379`	`{`
`380`	`380`	`return ($type !== 'array') ? $this->_fetch_object() : $this->_fetch_assoc();`
`381`		`-`
`382`	`381`	`}`
`383`	`382`
`384`	`383`	`// --------------------------------------------------------------------`
`385`		`-`
	`384`	`+`
`386`	`385`	`/**`
`387`	`386`	`* The following functions are normally overloaded by the identically named`
`388`	`387`	`* methods in the platform-specific driver -- except when query caching`
Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ protected function _update_batch($table, $values, $index, $where = NULL)`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`// --------------------------------------------------------------------`
`488`		`-`
	`488`	`+`
`489`	`489`	`/**`
`490`	`490`	`* Limit string`
`491`	`491`	`*`
`@@ -506,15 +506,14 @@ protected function _limit($sql, $limit, $offset)`
`506`	`506`	`/**`
`507`	`507`	`* Close DB Connection`
`508`	`508`	`*`
`509`		`- * @param resource`
`510`	`509`	`* @return void`
`511`	`510`	`*/`
`512`		`- protected function _close($conn_id)`
	`511`	`+ protected function _close()`
`513`	`512`	`{`
`514`		`- @cubrid_close($conn_id);`
	`513`	`+ @cubrid_close($this->conn_id);`
`515`	`514`	`}`
`516`	`515`
`517`	`516`	`}`
`518`	`517`
`519`	`518`	`/* End of file cubrid_driver.php */`
`520`		`-/* Location: ./system/database/drivers/cubrid/cubrid_driver.php */`
	`519`	`+/* Location: ./system/database/drivers/cubrid/cubrid_driver.php */`
Original file line number	Diff line number	Diff line change
`@@ -472,12 +472,11 @@ protected function _limit($sql, $limit, $offset)`
`472`	`472`	`/**`
`473`	`473`	`* Close DB Connection`
`474`	`474`	`*`
`475`		`- * @param resource`
`476`	`475`	`* @return void`
`477`	`476`	`*/`
`478`		`- protected function _close($conn_id)`
	`477`	`+ protected function _close()`
`479`	`478`	`{`
`480`		`- @ibase_close($conn_id);`
	`479`	`+ @ibase_close($this->conn_id);`
`481`	`480`	`}`
`482`	`481`
`483`	`482`	`}`
Original file line number	Diff line number	Diff line change
`@@ -523,15 +523,14 @@ protected function _limit($sql, $limit, $offset)`
`523`	`523`	`/**`
`524`	`524`	`* Close DB Connection`
`525`	`525`	`*`
`526`		`- * @param resource`
`527`	`526`	`* @return void`
`528`	`527`	`*/`
`529`		`- protected function _close($conn_id)`
	`528`	`+ protected function _close()`
`530`	`529`	`{`
`531`		`- @mssql_close($conn_id);`
	`530`	`+ @mssql_close($this->conn_id);`
`532`	`531`	`}`
`533`	`532`
`534`	`533`	`}`
`535`	`534`
`536`	`535`	`/* End of file mssql_driver.php */`
`537`		`-/* Location: ./system/database/drivers/mssql/mssql_driver.php */`
	`536`	`+/* Location: ./system/database/drivers/mssql/mssql_driver.php */`
Original file line number	Diff line number	Diff line change
`@@ -520,15 +520,14 @@ protected function _limit($sql, $limit, $offset)`
`520`	`520`	`/**`
`521`	`521`	`* Close DB Connection`
`522`	`522`	`*`
`523`		`- * @param resource`
`524`	`523`	`* @return void`
`525`	`524`	`*/`
`526`		`- protected function _close($conn_id)`
	`525`	`+ protected function _close()`
`527`	`526`	`{`
`528`		`- @mysql_close($conn_id);`
	`527`	`+ @mysql_close($this->conn_id);`
`529`	`528`	`}`
`530`	`529`
`531`	`530`	`}`
`532`	`531`
`533`	`532`	`/* End of file mysql_driver.php */`
`534`		`-/* Location: ./system/database/drivers/mysql/mysql_driver.php */`
	`533`	`+/* Location: ./system/database/drivers/mysql/mysql_driver.php */`
Original file line number	Diff line number	Diff line change
`@@ -523,16 +523,14 @@ protected function _limit($sql, $limit, $offset)`
`523`	`523`	`/**`
`524`	`524`	`* Close DB Connection`
`525`	`525`	`*`
`526`		`- * @param object`
`527`	`526`	`* @return void`
`528`	`527`	`*/`
`529`		`- protected function _close($conn_id)`
	`528`	`+ protected function _close()`
`530`	`529`	`{`
`531`	`530`	`$this->conn_id->close();`
`532`		`- $this->conn_id = FALSE;`
`533`	`531`	`}`
`534`	`532`
`535`	`533`	`}`
`536`	`534`
`537`	`535`	`/* End of file mysqli_driver.php */`
`538`		`-/* Location: ./system/database/drivers/mysqli/mysqli_driver.php */`
	`536`	`+/* Location: ./system/database/drivers/mysqli/mysqli_driver.php */`
Original file line number	Diff line number	Diff line change
`@@ -671,15 +671,14 @@ protected function _limit($sql, $limit, $offset)`
`671`	`671`	`/**`
`672`	`672`	`* Close DB Connection`
`673`	`673`	`*`
`674`		`- * @param resource`
`675`	`674`	`* @return void`
`676`	`675`	`*/`
`677`		`- protected function _close($conn_id)`
	`676`	`+ protected function _close()`
`678`	`677`	`{`
`679`		`- @oci_close($conn_id);`
	`678`	`+ @oci_close($this->conn_id);`
`680`	`679`	`}`
`681`	`680`
`682`	`681`	`}`
`683`	`682`
`684`	`683`	`/* End of file oci8_driver.php */`
`685`		`-/* Location: ./system/database/drivers/oci8/oci8_driver.php */`
	`684`	`+/* Location: ./system/database/drivers/oci8/oci8_driver.php */`
Original file line number	Diff line number	Diff line change
`@@ -402,15 +402,14 @@ protected function _limit($sql, $limit, $offset)`
`402`	`402`	`/**`
`403`	`403`	`* Close DB Connection`
`404`	`404`	`*`
`405`		`- * @param resource`
`406`	`405`	`* @return void`
`407`	`406`	`*/`
`408`		`- protected function _close($conn_id)`
	`407`	`+ protected function _close()`
`409`	`408`	`{`
`410`		`- @odbc_close($conn_id);`
	`409`	`+ @odbc_close($this->conn_id);`
`411`	`410`	`}`
`412`	`411`
`413`	`412`	`}`
`414`	`413`
`415`	`414`	`/* End of file odbc_driver.php */`
`416`		`-/* Location: ./system/database/drivers/odbc/odbc_driver.php */`
	`415`	`+/* Location: ./system/database/drivers/odbc/odbc_driver.php */`