summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--framework/Data/ActiveRecord/TActiveRecord.php4
-rw-r--r--framework/Data/TDbCommand.php4
-rw-r--r--framework/Data/TDbConnection.php14
-rw-r--r--framework/Data/TDbDataReader.php6
5 files changed, 15 insertions, 14 deletions
diff --git a/HISTORY b/HISTORY
index d2b9c397..d59c6cde 100644
--- a/HISTORY
+++ b/HISTORY
@@ -10,6 +10,7 @@ BUG: Ticket#753 - Themes not allways being set (Qiang)
BUG: Ticket#776 - Logout button should not cause validation in blog tutorial (Qiang)
BUG: Ticket#785 - TDatePicker OnDateChanged event problem (Christophe)
BUG: Ticket#766, #786 - TDbCache does not work with MySQL and PostgreSQL (Qiang)
+BUG: Ticket#799 - Fixed several link errors in documentation about PDO (Qiang)
BUG: Fixed a bug in TPropertyValue::ensureArray() (Qiang)
CHG: Changed TConditional so that the controls in its template behave like they are in its parent (Qiang)
CHG: Active Record many-to-many relationship change from self::HAS_MANY to self::MANY_TO_MANY (Wei)
diff --git a/framework/Data/ActiveRecord/TActiveRecord.php b/framework/Data/ActiveRecord/TActiveRecord.php
index 2bdba2d1..ba1bcc29 100644
--- a/framework/Data/ActiveRecord/TActiveRecord.php
+++ b/framework/Data/ActiveRecord/TActiveRecord.php
@@ -187,9 +187,9 @@ abstract class TActiveRecord extends TComponent
}
/**
- * Prevent __call() method creating __wake() when unserializing.
+ * Prevent __call() method creating __wakeup() when unserializing.
*/
- public function __wake()
+ public function __wakeup()
{
$this->setupColumnMapping();
$this->setupRelations();
diff --git a/framework/Data/TDbCommand.php b/framework/Data/TDbCommand.php
index 90e86844..b7985d3f 100644
--- a/framework/Data/TDbCommand.php
+++ b/framework/Data/TDbCommand.php
@@ -137,7 +137,7 @@ class TDbCommand extends TComponent
* @param mixed Name of the PHP variable to bind to the SQL statement parameter
* @param int SQL data type of the parameter
* @param int length of the data type
- * @see http://www.php.net/manual/en/function.pdostatement-bindparam.php
+ * @see http://www.php.net/manual/en/function.PDOStatement-bindParam.php
*/
public function bindParameter($name, &$value, $dataType=null, $length=null)
{
@@ -158,7 +158,7 @@ class TDbCommand extends TComponent
* placeholders, this will be the 1-indexed position of the parameter.
* @param mixed The value to bind to the parameter
* @param int SQL data type of the parameter
- * @see http://www.php.net/manual/en/function.pdostatement-bindvalue.php
+ * @see http://www.php.net/manual/en/function.PDOStatement-bindValue.php
*/
public function bindValue($name, $value, $dataType=null)
{
diff --git a/framework/Data/TDbConnection.php b/framework/Data/TDbConnection.php
index 55d2710c..23a6e58b 100644
--- a/framework/Data/TDbConnection.php
+++ b/framework/Data/TDbConnection.php
@@ -94,7 +94,7 @@ class TDbConnection extends TComponent
* @param string The Data Source Name, or DSN, contains the information required to connect to the database.
* @param string The user name for the DSN string.
* @param string The password for the DSN string.
- * @see http://www.php.net/manual/en/function.pdo-construct.php
+ * @see http://www.php.net/manual/en/function.PDO-construct.php
*/
public function __construct($dsn='',$username='',$password='')
{
@@ -114,7 +114,7 @@ class TDbConnection extends TComponent
/**
* @return array list of available PDO drivers
- * @see http://www.php.net/manual/en/function.pdo-getavailabledrivers.php
+ * @see http://www.php.net/manual/en/function.PDO-getAvailableDrivers.php
*/
public static function getAvailableDrivers()
{
@@ -188,7 +188,7 @@ class TDbConnection extends TComponent
/**
* @param string The Data Source Name, or DSN, contains the information required to connect to the database.
- * @see http://www.php.net/manual/en/function.pdo-construct.php
+ * @see http://www.php.net/manual/en/function.PDO-construct.php
*/
public function setConnectionString($value)
{
@@ -269,7 +269,7 @@ class TDbConnection extends TComponent
* Returns the ID of the last inserted row or sequence value.
* @param string name of the sequence object (required by some DBMS)
* @return string the row ID of the last row inserted, or the last value retrieved from the sequence object
- * @see http://www.php.net/manual/en/function.pdo-lastinsertid.php
+ * @see http://www.php.net/manual/en/function.PDO-lastInsertId.php
*/
public function getLastInsertID($sequenceName='')
{
@@ -283,7 +283,7 @@ class TDbConnection extends TComponent
* Quotes a string for use in a query.
* @param string string to be quoted
* @return string the properly quoted string
- * @see http://www.php.net/manual/en/function.pdo-quote.php
+ * @see http://www.php.net/manual/en/function.PDO-quote.php
*/
public function quoteString($str)
{
@@ -462,7 +462,7 @@ class TDbConnection extends TComponent
* Obtains a specific DB connection attribute information.
* @param int the attribute to be queried
* @return mixed the corresponding attribute information
- * @see http://www.php.net/manual/en/function.pdo-getattribute.php
+ * @see http://www.php.net/manual/en/function.PDO-getAttribute.php
*/
public function getAttribute($name)
{
@@ -476,7 +476,7 @@ class TDbConnection extends TComponent
* Sets an attribute on the database connection.
* @param int the attribute to be set
* @param mixed the attribute value
- * @see http://www.php.net/manual/en/function.pdo-setattribute.php
+ * @see http://www.php.net/manual/en/function.PDO-setAttribute.php
*/
public function setAttribute($name,$value)
{
diff --git a/framework/Data/TDbDataReader.php b/framework/Data/TDbDataReader.php
index 629b9fea..7952e6bc 100644
--- a/framework/Data/TDbDataReader.php
+++ b/framework/Data/TDbDataReader.php
@@ -26,7 +26,7 @@
* Since TDbDataReader is a forward-only stream, you can only traverse it once.
*
* It is possible to use a specific mode of data fetching by setting
- * {@link setFetchMode FetchMode}. See {@link http://www.php.net/manual/en/function.pdostatement-setfetchmode.php}
+ * {@link setFetchMode FetchMode}. See {@link http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php}
* for more details.
*
* @author Qiang Xue <qiang.xue@gmail.com>
@@ -60,7 +60,7 @@ class TDbDataReader extends TComponent implements Iterator
* should match the case of the column, as returned by the driver.
* @param mixed Name of the PHP variable to which the column will be bound.
* @param int Data type of the parameter
- * @see http://www.php.net/manual/en/function.pdostatement-bindcolumn.php
+ * @see http://www.php.net/manual/en/function.PDOStatement-bindColumn.php
*/
public function bindColumn($column, &$value, $dataType=null)
{
@@ -71,7 +71,7 @@ class TDbDataReader extends TComponent implements Iterator
}
/**
- * @see http://www.php.net/manual/en/function.pdostatement-setfetchmode.php
+ * @see http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php
*/
public function setFetchMode($mode)
{