Changeset 34 for trunk/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php

Timestamp:

06/29/07 15:17:46 (17 years ago)

Author:

niltonneto

Message:

Versão nova do ADODB (4.5 para 4.95)

File:

• trunk/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php (modified) (6 diffs)

trunk/phpgwapi/inc/adodb/drivers/adodb-sybase.inc.php

@@ -1 +1 @@
 <?php
 /* 
-V4.51 29 July 2004  (c) 2000-2004 John Lim. All rights reserved.
+V4.94 23 Jan 2007  (c) 2000-2007 John Lim. All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -21 +21 @@
 class ADODB_sybase extends ADOConnection {
         var $databaseType = "sybase";   
-        //var $dataProvider = 'sybase';
+        var $dataProvider = 'sybase';
         var $replaceQuote = "''"; // string to use to replace quotes
         var $fmtDate = "'Y-m-d'";
@@ -87 +87 @@
         
         // http://www.isug.com/Sybase_FAQ/ASE/section6.1.html#6.1.4
-        function RowLock($tables,$where) 
+        function RowLock($tables,$where,$flds='top 1 null as ignore') 
         {
                 if (!$this->_hastrans) $this->BeginTrans();
                 $tables = str_replace(',',' HOLDLOCK,',$tables);
-                return $this->GetOne("select top 1 null as ignore from $tables HOLDLOCK where $where");
+                return $this->GetOne("select $flds from $tables HOLDLOCK where $where");
                 
         }       
                 
-        function SelectDB($dbName) {
-                $this->databaseName = $dbName;
+        function SelectDB($dbName) 
+        {
+                $this->database = $dbName;
+                $this->databaseName = $dbName; # obsolete, retained for compat with older adodb versions
                 if ($this->_connectionID) {
                         return @sybase_select_db($dbName);              
@@ -106 +108 @@
                 Note: This function is NOT available for Microsoft SQL Server.  */      
 
-        function ErrorMsg() 
+        
+        function ErrorMsg()
         {
                 if ($this->_logsql) return $this->_errorMsg;
-                $this->_errorMsg = sybase_get_last_message();
+                if (function_exists('sybase_get_last_message'))
+                        $this->_errorMsg = sybase_get_last_message();
+                else
+                        $this->_errorMsg = isset($php_errormsg) ? $php_errormsg : 'SYBASE error messages not supported on this platform';
                 return $this->_errorMsg;
         }
@@ -152 +158 @@
                         return $rs;
                 }
-                $cnt = ($nrows > 0) ? $nrows : 0;
+                
+                $nrows = (integer) $nrows;
+                $offset = (integer) $offset;
+                
+                $cnt = ($nrows >= 0) ? $nrows : 999999999;
                 if ($offset > 0 && $cnt) $cnt += $offset;
                 
                 $this->Execute("set rowcount $cnt"); 
                 $rs =& ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,0);
-                $this->Execute("set rowcount 0"); 
+                $this->Execute("set rowcount 0");
                 
                 return $rs;
@@ -284 +294 @@
                 if (!$mode) $this->fetchMode = ADODB_FETCH_ASSOC;
                 else $this->fetchMode = $mode;
-                return $this->ADORecordSet($id,$mode);
+                $this->ADORecordSet($id,$mode);
         }