diff options
| author | Fabio Bas <ctrlaltca@gmail.com> | 2014-01-06 22:41:46 +0100 |
|---|---|---|
| committer | David <ottodavid@gmx.net> | 2014-08-21 17:20:54 +0200 |
| commit | fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 (patch) | |
| tree | 80fff53aa0d9c60612bc2ca690a46194e9c160cf /framework/Data/Common/Oracle | |
| parent | 48577f63f414dc3078abc4bdc93bde932fe666a6 (diff) | |
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
Diffstat (limited to 'framework/Data/Common/Oracle')
4 files changed, 9 insertions, 9 deletions
diff --git a/framework/Data/Common/Oracle/TOracleCommandBuilder.php b/framework/Data/Common/Oracle/TOracleCommandBuilder.php index 26490d54..e5bd2e59 100644 --- a/framework/Data/Common/Oracle/TOracleCommandBuilder.php +++ b/framework/Data/Common/Oracle/TOracleCommandBuilder.php @@ -5,7 +5,7 @@ * * @author Marcos Nobre <marconobre[at]gmail[dot]com> * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TOracleCommandBuilder.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.Common @@ -134,14 +134,14 @@ class TOracleCommandBuilder extends TDbCommandBuilder { " SELECT rownum as {$pradoNUMLIN} {$aliasedFields} FROM ". " ($sql) {$fieldsALIAS} WHERE rownum <= {$limit} ". ") WHERE {$pradoNUMLIN} >= {$offset} "; - + ************************* */ $offset=(int)$offset; $toReg = $offset + $limit ; $fullTableName = $this->getTableInfo()->getTableFullName(); - if (empty ($sORDERBY)) + if (empty ($sORDERBY)) $sORDERBY="ROWNUM"; - + $newSql = " SELECT $fields FROM " . "( " . " SELECT ROW_NUMBER() OVER ( ORDER BY {$sORDERBY} ) -1 as {$pradoNUMLIN} {$aliasedFields} " . diff --git a/framework/Data/Common/Oracle/TOracleMetaData.php b/framework/Data/Common/Oracle/TOracleMetaData.php index 793070ed..479841ba 100644 --- a/framework/Data/Common/Oracle/TOracleMetaData.php +++ b/framework/Data/Common/Oracle/TOracleMetaData.php @@ -4,7 +4,7 @@ * * @author Marcos Nobre <marconobre[at]gmail[dot]com> * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TOracleMetaData.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.Common.Oracle @@ -29,7 +29,7 @@ class TOracleMetaData extends TDbMetaData { private $_defaultSchema = 'system'; - + /** * @return string TDbTableInfo class name. */ diff --git a/framework/Data/Common/Oracle/TOracleTableColumn.php b/framework/Data/Common/Oracle/TOracleTableColumn.php index bbd7212c..3affc6b3 100644 --- a/framework/Data/Common/Oracle/TOracleTableColumn.php +++ b/framework/Data/Common/Oracle/TOracleTableColumn.php @@ -4,7 +4,7 @@ * * @author Marcos Nobre <marconobre[at]gmail[dot]com> * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TOracleTableColumn.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.Common.Oracle @@ -26,7 +26,7 @@ Prado::using('System.Data.Common.TDbTableColumn'); class TOracleTableColumn extends TDbTableColumn { private static $types=array( - 'numeric' => array( 'numeric' ) + 'numeric' => array( 'numeric' ) // 'integer' => array('bit', 'bit varying', 'real', 'serial', 'int', 'integer'), // 'boolean' => array('boolean'), // 'float' => array('bigint', 'bigserial', 'double precision', 'money', 'numeric') diff --git a/framework/Data/Common/Oracle/TOracleTableInfo.php b/framework/Data/Common/Oracle/TOracleTableInfo.php index 6aa31fd8..9e65a1e6 100644 --- a/framework/Data/Common/Oracle/TOracleTableInfo.php +++ b/framework/Data/Common/Oracle/TOracleTableInfo.php @@ -5,7 +5,7 @@ * * @author Marcos Nobre <marconobre[at]gmail[dot]com> * @link http://www.pradosoft.com/ - * @copyright Copyright © 2005-2013 PradoSoft + * @copyright Copyright © 2005-2014 PradoSoft * @license http://www.pradosoft.com/license/ * @version $Id: TOracleTableInfo.php 3245 2013-01-07 20:23:32Z ctrlaltca $ * @package System.Data.Common |