From fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 6 Jan 2014 22:41:46 +0100 Subject: Happy 2014! (cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae) Conflicts: framework/Data/Common/Mssql/TMssqlMetaData.php framework/Data/Common/Mysql/TMysqlMetaData.php framework/Data/Common/Oracle/TOracleMetaData.php framework/Data/Common/Pgsql/TPgsqlMetaData.php framework/Data/Common/Sqlite/TSqliteMetaData.php framework/Data/Common/TDbMetaData.php framework/Web/UI/ActiveControls/TCallbackClientScript.php framework/Web/UI/JuiControls/TJuiAutoComplete.php framework/Web/UI/JuiControls/TJuiControlAdapter.php framework/Web/UI/JuiControls/TJuiDraggable.php framework/Web/UI/JuiControls/TJuiDroppable.php framework/Web/UI/JuiControls/TJuiResizable.php framework/Web/UI/JuiControls/TJuiSelectable.php framework/Web/UI/JuiControls/TJuiSortable.php framework/Wsat/TWsatARGenerator.php framework/Wsat/TWsatService.php framework/Wsat/pages/TWsatGenerateAR.php framework/Wsat/pages/TWsatHome.php framework/Wsat/pages/TWsatLogin.php framework/Wsat/pages/TWsatScaffolding.php --- framework/Data/SqlMap/Statements/TCachingStatement.php | 2 +- .../Data/SqlMap/Statements/TDeleteMappedStatement.php | 2 +- .../Data/SqlMap/Statements/TInsertMappedStatement.php | 2 +- framework/Data/SqlMap/Statements/TMappedStatement.php | 8 ++++---- framework/Data/SqlMap/Statements/TPreparedCommand.php | 2 +- framework/Data/SqlMap/Statements/TPreparedStatement.php | 14 +++++++------- .../Data/SqlMap/Statements/TPreparedStatementFactory.php | 2 +- .../Data/SqlMap/Statements/TSelectMappedStatement.php | 2 +- framework/Data/SqlMap/Statements/TSimpleDynamicSql.php | 2 +- framework/Data/SqlMap/Statements/TStaticSql.php | 2 +- .../Data/SqlMap/Statements/TUpdateMappedStatement.php | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) (limited to 'framework/Data/SqlMap/Statements') diff --git a/framework/Data/SqlMap/Statements/TCachingStatement.php b/framework/Data/SqlMap/Statements/TCachingStatement.php index b01280de..ef8c6c53 100644 --- a/framework/Data/SqlMap/Statements/TCachingStatement.php +++ b/framework/Data/SqlMap/Statements/TCachingStatement.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TCachingStatement.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.SqlMap.Statements diff --git a/framework/Data/SqlMap/Statements/TDeleteMappedStatement.php b/framework/Data/SqlMap/Statements/TDeleteMappedStatement.php index 4b023dc7..0a5584fd 100644 --- a/framework/Data/SqlMap/Statements/TDeleteMappedStatement.php +++ b/framework/Data/SqlMap/Statements/TDeleteMappedStatement.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TDeleteMappedStatement.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.SqlMap.Statements diff --git a/framework/Data/SqlMap/Statements/TInsertMappedStatement.php b/framework/Data/SqlMap/Statements/TInsertMappedStatement.php index 02bd4a68..ea205906 100644 --- a/framework/Data/SqlMap/Statements/TInsertMappedStatement.php +++ b/framework/Data/SqlMap/Statements/TInsertMappedStatement.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TInsertMappedStatement.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.SqlMap.Statements diff --git a/framework/Data/SqlMap/Statements/TMappedStatement.php b/framework/Data/SqlMap/Statements/TMappedStatement.php index 40caf4f7..5995f4e6 100644 --- a/framework/Data/SqlMap/Statements/TMappedStatement.php +++ b/framework/Data/SqlMap/Statements/TMappedStatement.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TMappedStatement.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.SqlMap.Statements @@ -924,10 +924,10 @@ class TMappedStatement extends TComponent implements IMappedStatement parent::__wakeup(); if (is_null($this->_selectQueue)) $this->_selectQueue = array(); } - + public function __sleep() { - $exprops = array(); $cn = __CLASS__; + $exprops = array(); $cn = __CLASS__; if (!count($this->_selectQueue)) $exprops[] = "\0$cn\0_selectQueue"; if (is_null($this->_groupBy)) $exprops[] = "\0$cn\0_groupBy"; if (!$this->_IsRowDataFound) $exprops[] = "\0$cn\0_IsRowDataFound"; @@ -1151,7 +1151,7 @@ class TSqlMapObjectCollectionTree extends TComponent public function __sleep() { - $exprops = array(); $cn = __CLASS__; + $exprops = array(); $cn = __CLASS__; if (!count($this->_tree)) $exprops[] = "\0$cn\0_tree"; if (!count($this->_entries)) $exprops[] = "\0$cn\0_entries"; if (!count($this->_list)) $exprops[] = "\0$cn\0_list"; diff --git a/framework/Data/SqlMap/Statements/TPreparedCommand.php b/framework/Data/SqlMap/Statements/TPreparedCommand.php index 1e6906a1..19a6bdbe 100644 --- a/framework/Data/SqlMap/Statements/TPreparedCommand.php +++ b/framework/Data/SqlMap/Statements/TPreparedCommand.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TPreparedCommand.php 3261 2013-01-22 22:36:51Z ctrlaltca $ * @package System.Data.SqlMap.Statements diff --git a/framework/Data/SqlMap/Statements/TPreparedStatement.php b/framework/Data/SqlMap/Statements/TPreparedStatement.php index 4127eae0..d11c2b99 100644 --- a/framework/Data/SqlMap/Statements/TPreparedStatement.php +++ b/framework/Data/SqlMap/Statements/TPreparedStatement.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TPreparedStatement.php 3261 2013-01-22 22:36:51Z ctrlaltca $ * @package System.Data.SqlMap.Statements @@ -28,26 +28,26 @@ class TPreparedStatement extends TComponent public function setPreparedSql($value){ $this->_sqlString = $value; } public function getParameterNames($needed = true) - { + { if (!$this->_parameterNames and $needed) $this->_parameterNames = new TList; - return $this->_parameterNames; + return $this->_parameterNames; } public function setParameterNames($value){ $this->_parameterNames = $value; } public function getParameterValues($needed = true) - { + { if (!$this->_parameterValues and $needed) $this->_parameterValues=new TMap; - return $this->_parameterValues; + return $this->_parameterValues; } public function setParameterValues($value){ $this->_parameterValues = $value; } - + public function __sleep() { - $exprops = array(); $cn = __CLASS__; + $exprops = array(); $cn = __CLASS__; if (!$this->_parameterNames or !$this->_parameterNames->getCount()) $exprops[] = "\0$cn\0_parameterNames"; if (!$this->_parameterValues or !$this->_parameterValues->getCount()) $exprops[] = "\0$cn\0_parameterValues"; return array_diff(parent::__sleep(),$exprops); diff --git a/framework/Data/SqlMap/Statements/TPreparedStatementFactory.php b/framework/Data/SqlMap/Statements/TPreparedStatementFactory.php index 5fdd16b5..2968aef6 100644 --- a/framework/Data/SqlMap/Statements/TPreparedStatementFactory.php +++ b/framework/Data/SqlMap/Statements/TPreparedStatementFactory.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TPreparedStatementFactory.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.SqlMap.Statements diff --git a/framework/Data/SqlMap/Statements/TSelectMappedStatement.php b/framework/Data/SqlMap/Statements/TSelectMappedStatement.php index b0926c41..d7068cbf 100644 --- a/framework/Data/SqlMap/Statements/TSelectMappedStatement.php +++ b/framework/Data/SqlMap/Statements/TSelectMappedStatement.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TSelectMappedStatement.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.SqlMap.Statements diff --git a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php index 3fce2e3a..ac4eb17f 100644 --- a/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php +++ b/framework/Data/SqlMap/Statements/TSimpleDynamicSql.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TSimpleDynamicSql.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.SqlMap.Statements diff --git a/framework/Data/SqlMap/Statements/TStaticSql.php b/framework/Data/SqlMap/Statements/TStaticSql.php index 1da6330e..3f52d521 100644 --- a/framework/Data/SqlMap/Statements/TStaticSql.php +++ b/framework/Data/SqlMap/Statements/TStaticSql.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TStaticSql.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.SqlMap.Statements diff --git a/framework/Data/SqlMap/Statements/TUpdateMappedStatement.php b/framework/Data/SqlMap/Statements/TUpdateMappedStatement.php index d3c3acc4..ec1135eb 100644 --- a/framework/Data/SqlMap/Statements/TUpdateMappedStatement.php +++ b/framework/Data/SqlMap/Statements/TUpdateMappedStatement.php @@ -4,7 +4,7 @@ * * @author Wei Zhuo * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TUpdateMappedStatement.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.SqlMap.Statements -- cgit v1.2.3