From 5cce5955189943fa7ad5c40af4299eae73648a2e Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Wed, 4 Aug 2010 12:10:29 +0200
Subject: [PATCH] DibiConnection::sql() renamed to verb translate()

---
 dibi/libs/DibiConnection.php | 13 ++++++++++++-
 dibi/libs/DibiDataSource.php |  2 +-
 dibi/libs/DibiFluent.php     |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/dibi/libs/DibiConnection.php b/dibi/libs/DibiConnection.php
index a854240c..11651aac 100644
--- a/dibi/libs/DibiConnection.php
+++ b/dibi/libs/DibiConnection.php
@@ -260,7 +260,7 @@ class DibiConnection extends DibiObject
 	 * @return string
 	 * @throws DibiException
 	 */
-	final public function sql($args)
+	final public function translate($args)
 	{
 		$this->connected || $this->connect();
 		$args = func_get_args();
@@ -269,6 +269,17 @@ class DibiConnection extends DibiObject
 
 
 
+	/** @deprecated */
+	function sql($args)
+	{
+		trigger_error(__METHOD__ . '() is deprecated; use translate() instead.', E_USER_NOTICE);
+		$this->connected || $this->connect();
+		$args = func_get_args();
+		return $this->translator->translate($args);
+	}
+
+
+
 	/**
 	 * Generates and prints SQL query.
 	 * @param  array|mixed  one or more arguments
diff --git a/dibi/libs/DibiDataSource.php b/dibi/libs/DibiDataSource.php
index 3b6b02bb..b56e33ec 100644
--- a/dibi/libs/DibiDataSource.php
+++ b/dibi/libs/DibiDataSource.php
@@ -286,7 +286,7 @@ class DibiDataSource extends DibiObject implements IDataSource
 	 */
 	public function __toString()
 	{
-		return $this->connection->sql('
+		return $this->connection->translate('
 			SELECT %n', (empty($this->cols) ? '*' : $this->cols), '
 			FROM %SQL', $this->sql, '
 			%ex', $this->conds ? array('WHERE %and', $this->conds) : NULL, '
diff --git a/dibi/libs/DibiFluent.php b/dibi/libs/DibiFluent.php
index 3d96d1dd..841fc52f 100644
--- a/dibi/libs/DibiFluent.php
+++ b/dibi/libs/DibiFluent.php
@@ -422,7 +422,7 @@ class DibiFluent extends DibiObject implements IDataSource
 	 */
 	public function toDataSource()
 	{
-		return new DibiDataSource($this->connection->sql($this->_export()), $this->connection);
+		return new DibiDataSource($this->connection->translate($this->_export()), $this->connection);
 	}
 
 
@@ -433,7 +433,7 @@ class DibiFluent extends DibiObject implements IDataSource
 	 */
 	final public function __toString()
 	{
-		return $this->connection->sql($this->_export());
+		return $this->connection->translate($this->_export());
 	}