Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[10062] trunk
|
From: <var...@us...> - 2019-03-29 14:02:45
|
Revision: 10062
http://sourceforge.net/p/phpwiki/code/10062
Author: vargenau
Date: 2019-03-29 14:02:43 +0000 (Fri, 29 Mar 2019)
Log Message:
-----------
Update Pear DB library to 1.9.3
Modified Paths:
--------------
trunk/lib/pear/DB/common.php
trunk/lib/pear/DB/dbase.php
trunk/lib/pear/DB/fbsql.php
trunk/lib/pear/DB/ibase.php
trunk/lib/pear/DB/ifx.php
trunk/lib/pear/DB/msql.php
trunk/lib/pear/DB/mssql.php
trunk/lib/pear/DB/mysql.php
trunk/lib/pear/DB/mysqli.php
trunk/lib/pear/DB/oci8.php
trunk/lib/pear/DB/odbc.php
trunk/lib/pear/DB/pgsql.php
trunk/lib/pear/DB/sqlite.php
trunk/lib/pear/DB/storage.php
trunk/lib/pear/DB/sybase.php
trunk/lib/pear/DB.php
trunk/pgsrc/ReleaseNotes
Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/common.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -42,7 +42,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_common extends PEAR
@@ -1202,7 +1202,8 @@
*/
function &query($query, $params = array())
{
- if (sizeof($params) > 0) {
+ $params = (array)$params;
+ if (count($params)) {
$sth = $this->prepare($query);
if (DB::isError($sth)) {
return $sth;
@@ -1341,7 +1342,8 @@
}
}
// modifyLimitQuery() would be nice here, but it causes BC issues
- if (sizeof($params) > 0) {
+ $params = (array)$params;
+ if (count($params)) {
$sth = $this->prepare($query);
if (DB::isError($sth)) {
return $sth;
@@ -1649,7 +1651,8 @@
}
}
- if (sizeof($params) > 0) {
+ $params = (array)$params;
+ if (count($params)) {
$sth = $this->prepare($query);
if (DB::isError($sth)) {
Modified: trunk/lib/pear/DB/dbase.php
===================================================================
--- trunk/lib/pear/DB/dbase.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/dbase.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -41,7 +41,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_dbase extends DB_common
Modified: trunk/lib/pear/DB/fbsql.php
===================================================================
--- trunk/lib/pear/DB/fbsql.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/fbsql.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -41,7 +41,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
* @since Class functional since Release 1.7.0
*/
Modified: trunk/lib/pear/DB/ibase.php
===================================================================
--- trunk/lib/pear/DB/ibase.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/ibase.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -49,7 +49,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
* @since Class became stable in Release 1.7.0
*/
Modified: trunk/lib/pear/DB/ifx.php
===================================================================
--- trunk/lib/pear/DB/ifx.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/ifx.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -48,7 +48,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_ifx extends DB_common
Modified: trunk/lib/pear/DB/msql.php
===================================================================
--- trunk/lib/pear/DB/msql.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/msql.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -47,7 +47,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
* @since Class not functional until Release 1.7.0
*/
Modified: trunk/lib/pear/DB/mssql.php
===================================================================
--- trunk/lib/pear/DB/mssql.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/mssql.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -49,7 +49,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_mssql extends DB_common
Modified: trunk/lib/pear/DB/mysql.php
===================================================================
--- trunk/lib/pear/DB/mysql.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/mysql.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -41,7 +41,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_mysql extends DB_common
Modified: trunk/lib/pear/DB/mysqli.php
===================================================================
--- trunk/lib/pear/DB/mysqli.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/mysqli.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -43,7 +43,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
* @since Class functional since Release 1.6.3
*/
Modified: trunk/lib/pear/DB/oci8.php
===================================================================
--- trunk/lib/pear/DB/oci8.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/oci8.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -47,7 +47,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_oci8 extends DB_common
Modified: trunk/lib/pear/DB/odbc.php
===================================================================
--- trunk/lib/pear/DB/odbc.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/odbc.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -44,7 +44,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_odbc extends DB_common
Modified: trunk/lib/pear/DB/pgsql.php
===================================================================
--- trunk/lib/pear/DB/pgsql.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/pgsql.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -43,7 +43,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_pgsql extends DB_common
@@ -325,7 +325,7 @@
$query = $this->modifyQuery($query);
if (!$this->autocommit && $ismanip) {
if ($this->transaction_opcount == 0) {
- $result = @pg_exec($this->connection, 'begin;');
+ $result = @pg_query($this->connection, 'begin;');
if (!$result) {
return $this->pgsqlRaiseError();
}
@@ -332,7 +332,7 @@
}
$this->transaction_opcount++;
}
- $result = @pg_exec($this->connection, $query);
+ $result = @pg_query($this->connection, $query);
if (!$result) {
return $this->pgsqlRaiseError();
}
@@ -598,7 +598,7 @@
if ($this->transaction_opcount > 0) {
// (disabled) hack to shut up error messages from libpq.a
//@fclose(@fopen("php://stderr", "w"));
- $result = @pg_exec($this->connection, 'end;');
+ $result = @pg_query($this->connection, 'end;');
$this->transaction_opcount = 0;
if (!$result) {
return $this->pgsqlRaiseError();
@@ -618,7 +618,7 @@
function rollback()
{
if ($this->transaction_opcount > 0) {
- $result = @pg_exec($this->connection, 'abort;');
+ $result = @pg_query($this->connection, 'abort;');
$this->transaction_opcount = 0;
if (!$result) {
return $this->pgsqlRaiseError();
@@ -887,7 +887,7 @@
* Probably received a table name.
* Create a result resource identifier.
*/
- $id = @pg_exec($this->connection, "SELECT * FROM $result LIMIT 0");
+ $id = @pg_query($this->connection, "SELECT * FROM $result LIMIT 0");
$got_string = true;
} elseif (isset($result->result)) {
/*
@@ -980,7 +980,7 @@
$tableWhere = "tab.relname = '$table_name'";
}
- $result = @pg_exec($this->connection, "SELECT f.attnotnull, f.atthasdef
+ $result = @pg_query($this->connection, "SELECT f.attnotnull, f.atthasdef
FROM $from
WHERE tab.relname = typ.typname
AND typ.typrelid = f.attrelid
@@ -991,7 +991,7 @@
$flags = ($row[0] == 't') ? 'not_null ' : '';
if ($row[1] == 't') {
- $result = @pg_exec($this->connection, "SELECT a.adsrc
+ $result = @pg_query($this->connection, "SELECT a.adsrc
FROM $from, pg_attrdef a
WHERE tab.relname = typ.typname AND typ.typrelid = f.attrelid
AND f.attrelid = a.adrelid AND f.attname = '$field_name'
@@ -1003,7 +1003,7 @@
} else {
$flags = '';
}
- $result = @pg_exec($this->connection, "SELECT i.indisunique, i.indisprimary, i.indkey
+ $result = @pg_query($this->connection, "SELECT i.indisunique, i.indisprimary, i.indkey
FROM $from, pg_index i
WHERE tab.relname = typ.typname
AND typ.typrelid = f.attrelid
Modified: trunk/lib/pear/DB/sqlite.php
===================================================================
--- trunk/lib/pear/DB/sqlite.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/sqlite.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -47,7 +47,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_sqlite extends DB_common
Modified: trunk/lib/pear/DB/storage.php
===================================================================
--- trunk/lib/pear/DB/storage.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/storage.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -38,7 +38,7 @@
* @author Stig Bakken <st...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_storage extends PEAR
Modified: trunk/lib/pear/DB/sybase.php
===================================================================
--- trunk/lib/pear/DB/sybase.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB/sybase.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -17,7 +17,7 @@
* @category Database
* @package DB
* @author Sterling Hughes <ste...@ph...>
- * @author Antônio Carlos Venâncio Júnior
+ * @author Antônio Carlos Venâncio Júnior <fl...@ph...>
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
@@ -42,11 +42,11 @@
* @category Database
* @package DB
* @author Sterling Hughes <ste...@ph...>
- * @author Antônio Carlos Venâncio Júnior
+ * @author Antônio Carlos Venâncio Júnior <fl...@ph...>
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_sybase extends DB_common
Modified: trunk/lib/pear/DB.php
===================================================================
--- trunk/lib/pear/DB.php 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/lib/pear/DB.php 2019-03-29 14:02:43 UTC (rev 10062)
@@ -426,7 +426,7 @@
* @author Daniel Convissor <da...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB
@@ -577,7 +577,7 @@
*/
function apiVersion()
{
- return '1.9.2';
+ return '1.9.3';
}
// }}}
@@ -772,7 +772,7 @@
$parsed['dbsyntax'] = $str;
}
- if (!count($dsn)) {
+ if (empty($dsn)) {
return $parsed;
}
@@ -941,7 +941,7 @@
* @author Stig Bakken <ss...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_Error extends PEAR_Error
@@ -1002,7 +1002,7 @@
* @author Stig Bakken <ss...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
*/
class DB_result
@@ -1467,7 +1467,7 @@
* @author Stig Bakken <ss...@ph...>
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version Release: 1.9.2
+ * @version Release: 1.9.3
* @link http://pear.php.net/package/DB
* @see DB_common::setFetchMode()
*/
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes 2019-03-29 13:42:39 UTC (rev 10061)
+++ trunk/pgsrc/ReleaseNotes 2019-03-29 14:02:43 UTC (rev 10062)
@@ -17,7 +17,7 @@
Changes:
* Update jQuery to 2.2.4: Internet Explorer <= 8 no longer supported
* Pear: use ##mysqli## instead of ##mysql##
-* Update Pear DB library to 1.9.2
+* Update Pear DB library to 1.9.3
* Replace ##ereg## functions
* Update Adodb to version 5.20.9
* Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
