summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortof <>2008-04-18 13:12:19 +0000
committertof <>2008-04-18 13:12:19 +0000
commit8897ba06f7b959db228aaf8b7d7ec5d50a11ae70 (patch)
tree3c19e1215baf812310154d467b63d7bdd7a486ce
parenta54dcaa9d7fbdc7a3f14d33ef3cf36feb29f9f39 (diff)
Fixed #833
-rw-r--r--HISTORY2
-rw-r--r--framework/Data/TDbConnection.php11
2 files changed, 9 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index 151ec365..abf36549 100644
--- a/HISTORY
+++ b/HISTORY
@@ -38,7 +38,7 @@ ENH: Ticket#743 - Added status code header in HTTP response when in error (Qiang
ENH: Ticket#745 - TWizard action MoveTo - allow specify step ID's (Christophe)
ENH: Ticket#757 - TDateFormat and TNumberFormat now implement IDataRenderer (Qiang)
ENH: Ticket#783 - Added date/time type support to soap implementation (Hongliang)
-ENH: Ticket#800 - Added database connection charset for MySql (donkee)
+ENH: Ticket#800,#833 - Added database connection charset for MySql and PgSql (donkee)
ENH: Active Record supports multiple foreign references of the same table (Wei)
ENH: Added TDbCommand.queryColumn() (Qiang)
ENH: Active Record now supports implicitly declared related properties (Qiang)
diff --git a/framework/Data/TDbConnection.php b/framework/Data/TDbConnection.php
index 08a8695a..2f5a0358 100644
--- a/framework/Data/TDbConnection.php
+++ b/framework/Data/TDbConnection.php
@@ -27,7 +27,9 @@ Prado::using('System.Data.TDbCommand');
* specifying {@link setConnectionString ConnectionString}, {@link setUsername Username}
* and {@link setPassword Password}.
*
- * Since 3.1.2, the connection charset can be set (for MySQL databases only) using the {@link setCharset Charset} property.
+ * Since 3.1.2, the connection charset can be set (for MySQL and PostgreSQL databases only)
+ * using the {@link setCharset Charset} property. The value of this property is database dependant.
+ * e.g. for mysql, you can use 'latin1' for cp1252 West European, 'utf8' for unicode, ...
*
* The following example shows how to create a TDbConnection instance and establish
* the actual connection:
@@ -100,7 +102,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.
- * @param string Charset used for DB Connection (MySql only). If not set, will use the default charset of your database server
+ * @param string Charset used for DB Connection (MySql & pgsql only). If not set, will use the default charset of your database server
* @see http://www.php.net/manual/en/function.PDO-construct.php
*/
public function __construct($dsn='',$username='',$password='', $charset='')
@@ -200,9 +202,12 @@ class TDbConnection extends TComponent
{
case 'mysql':
$stmt = $this->_pdo->prepare('SET CHARACTER SET ?');
- $stmt->execute(array($this->_charset));
+ break;
+ case 'pgsql':
+ $stmt = $this->_pdo->prepare('SET client_encoding TO ?');
break;
}
+ $stmt->execute(array($this->_charset));
}
/**