Changeset 34 for trunk/phpgwapi/inc/adodb/drivers/adodb-postgres64.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-postgres64.inc.php (modified) (39 diffs)

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

@@ -1 +1 @@
 <?php
 /*
- V4.51 29 July 2004  (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
+ V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -50 +50 @@
         $len = strlen($s);
         if ($len == 0) return "''";
-        if (strncmp($s,"'",1) === 0 && substr(s,$len-1) == "'") return $s; // already quoted
+        if (strncmp($s,"'",1) === 0 && substr($s,$len-1) == "'") return $s; // already quoted
         
         return "'".addslashes($s)."'";
@@ -74 +74 @@
         var $metaColumnsSQL = "SELECT a.attname,t.typname,a.attlen,a.atttypmod,a.attnotnull,a.atthasdef,a.attnum 
                 FROM pg_class c, pg_attribute a,pg_type t 
-                WHERE relkind = 'r' AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
+                WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s')) and a.attname not like '....%%'
 AND a.attnum > 0 AND a.atttypid = t.oid AND a.attrelid = c.oid ORDER BY a.attnum";
 
+        // used when schema defined
         var $metaColumnsSQL1 = "SELECT a.attname, t.typname, a.attlen, a.atttypmod, a.attnotnull, a.atthasdef, a.attnum 
 FROM pg_class c, pg_attribute a, pg_type t, pg_namespace n 
-WHERE relkind = 'r' AND (c.relname='%s' or c.relname = lower('%s'))
+WHERE relkind in ('r','v') AND (c.relname='%s' or c.relname = lower('%s'))
  and c.relnamespace=n.oid and n.nspname='%s' 
         and a.attname not like '....%%' AND a.attnum > 0 
@@ -91 +92 @@
         var $hasLimit = false;  // set to true for pgsql 7 only. support pgsql/mysql SELECT * FROM TABLE LIMIT 10
         // below suggested by Freek Dijkstra 
-        var $true = 't';                // string that represents TRUE for a database
-        var $false = 'f';               // string that represents FALSE for a database
+        var $true = 'TRUE';             // string that represents TRUE for a database
+        var $false = 'FALSE';           // string that represents FALSE for a database
         var $fmtDate = "'Y-m-d'";       // used by DBDate() as the default date format used by the database
-        var $fmtTimeStamp = "'Y-m-d G:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
+        var $fmtTimeStamp = "'Y-m-d H:i:s'"; // used by DBTimeStamp as the default timestamp fmt.
         var $hasMoveFirst = true;
         var $hasGenID = true;
@@ -102 +103 @@
         var $metaDefaultsSQL = "SELECT d.adnum as num, d.adsrc as def from pg_attrdef d, pg_class c where d.adrelid=c.oid and c.relname='%s' order by d.adnum";
         var $random = 'random()';               /// random function
-        var $autoRollback = true; // apparently pgsql does not autorollback properly before 4.3.4
+        var $autoRollback = true; // apparently pgsql does not autorollback properly before php 4.3.4
                                                         // http://bugs.php.net/bug.php?id=25404
                                                         
         var $_bindInputArray = false; // requires postgresql 7.3+ and ability to modify database
+        var $disableBlobs = false; // set to true to disable blob checking, resulting in 2-5% improvement in performance.
         
         // The last (fmtTimeStamp is not entirely correct: 
@@ -129 +131 @@
                 return $arr;
         }
-/*
+
         function IfNull( $field, $ifNull ) 
         {
-                return " NULLIF($field, $ifNull) "; // if PGSQL
-        }
-*/
+                return " coalesce($field, $ifNull) "; 
+        }
+
         // get the last id - never tested
         function pg_insert_id($tablename,$fieldname)
@@ -151 +153 @@
 Unless you are very careful, you might end up with a tuple having 
 a different OID if a database must be reloaded. */
-        function _insertid()
+        function _insertid($table,$column)
         {
                 if (!is_resource($this->_resultid) || get_resource_type($this->_resultid) !== 'pgsql result') return false;
-                return pg_getlastoid($this->_resultid);
+                $oid = pg_getlastoid($this->_resultid);
+                // to really return the id, we need the table and column-name, else we can only return the oid != id
+                return empty($table) || empty($column) ? $oid : $this->GetOne("SELECT $column FROM $table WHERE oid=".(int)$oid);
         }
 
 // I get this error with PHP before 4.0.6 - jlim
-// Warning: This compilation does not support pg_cmdtuples() in d:/inetpub/wwwroot/php/adodb/adodb-postgres.inc.php on line 44
+// Warning: This compilation does not support pg_cmdtuples() in adodb-postgres.inc.php on line 44
    function _affectedrows()
    {
@@ -171 +175 @@
                 if ($this->transOff) return true;
                 $this->transCnt += 1;
-                return @pg_Exec($this->_connectionID, "begin");
-        }
-        
-        function RowLock($tables,$where) 
+                return @pg_Exec($this->_connectionID, "begin ".$this->_transmode);
+        }
+        
+        function RowLock($tables,$where,$flds='1 as ignore') 
         {
                 if (!$this->transCnt) $this->BeginTrans();
-                return $this->GetOne("select 1 as ignore from $tables where $where for update");
+                return $this->GetOne("select $flds from $tables where $where for update");
         }
 
@@ -199 +203 @@
         
         function &MetaTables($ttype=false,$showSchema=false,$mask=false) 
-        {       
+        {
+                $info = $this->ServerInfo();
+                if ($info['version'] >= 7.3) {
+                $this->metaTablesSQL = "select tablename,'T' from pg_tables where tablename not like 'pg\_%'
+                          and schemaname  not in ( 'pg_catalog','information_schema')
+        union 
+        select viewname,'V' from pg_views where viewname not like 'pg\_%'  and schemaname  not in ( 'pg_catalog','information_schema') ";
+                }
                 if ($mask) {
                         $save = $this->metaTablesSQL;
                         $mask = $this->qstr(strtolower($mask));
-                        $this->metaTablesSQL = "
-select tablename,'T' from pg_tables where tablename like $mask union 
+                        if ($info['version']>=7.3)
+                                $this->metaTablesSQL = "
+select tablename,'T' from pg_tables where tablename like $mask and schemaname not in ( 'pg_catalog','information_schema')  
+ union 
+select viewname,'V' from pg_views where viewname like $mask and schemaname  not in ( 'pg_catalog','information_schema')  ";
+                        else
+                                $this->metaTablesSQL = "
+select tablename,'T' from pg_tables where tablename like $mask 
+ union 
 select viewname,'V' from pg_views where viewname like $mask";
                 }
@@ -215 +233 @@
         }
         
-        /*
+        
         // if magic quotes disabled, use pg_escape_string()
         function qstr($s,$magic_quotes=false)
         {
                 if (!$magic_quotes) {
-                        if (ADODB_PHPVER >= 0x4200) {
-                                return  "'".pg_escape_string($s)."'";
-                        }
                         if ($this->replaceQuote[0] == '\\'){
-                                $s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\0"),$s);
+                                $s = adodb_str_replace(array('\\',"\0"),array('\\\\',"\\\\000"),$s);
                         }
                         return  "'".str_replace("'",$this->replaceQuote,$s)."'"; 
@@ -233 +248 @@
                 return "'$s'";
         }
-        */
+        
         
         
@@ -288 +303 @@
                                 break;
                                 
+                        case 'w':
+                                $s .= 'D';
+                                break;
+                        
+                        case 'l':
+                                $s .= 'DAY';
+                                break;
+                        
+                         case 'W':
+                                $s .= 'WW';
+                                break;
+
                         default:
                         // handle escape characters...
@@ -332 +359 @@
         } 
         
+        /*
+        * Deletes/Unlinks a Blob from the database, otherwise it 
+        * will be left behind
+        *
+        * Returns TRUE on success or FALSE on failure.
+        *
+        * contributed by Todd Rogers todd#windfox.net
+        */
+        function BlobDelete( $blob )
+        {
+                pg_exec ($this->_connectionID, "begin");
+                $result = @pg_lo_unlink($blob);
+                pg_exec ($this->_connectionID, "commit");
+                return( $result );
+        }
+
+        /*
+                Hueristic - not guaranteed to work.
+        */
+        function GuessOID($oid)
+        {
+                if (strlen($oid)>16) return false;
+                return is_numeric($oid);
+        }
+        
         /* 
         * If an OID is detected, then we use pg_lo_* to open the oid file and read the
@@ -340 +392 @@
         *
         * see http://www.postgresql.org/idocs/index.php?largeobjects.html
+        *
+        * Since adodb 4.54, this returns the blob, instead of sending it to stdout. Also
+        * added maxsize parameter, which defaults to $db->maxblobsize if not defined.
         */ 
-        function BlobDecode( $blob) 
-        { 
-                if (strlen($blob) > 24) return $blob;
-                
-                @pg_exec($this->_connectionID,"begin"); 
+        function BlobDecode($blob,$maxsize=false,$hastrans=true) 
+        {
+                if (!$this->GuessOID($blob)) return $blob;
+                
+                if ($hastrans) @pg_exec($this->_connectionID,"begin"); 
                 $fd = @pg_lo_open($this->_connectionID,$blob,"r");
                 if ($fd === false) {
-                        @pg_exec($this->_connectionID,"commit");
+                        if ($hastrans) @pg_exec($this->_connectionID,"commit");
                         return $blob;
                 }
-                $realblob = @pg_loreadall($fd); 
+                if (!$maxsize) $maxsize = $this->maxblobsize;
+                $realblob = @pg_loread($fd,$maxsize); 
                 @pg_loclose($fd); 
-                @pg_exec($this->_connectionID,"commit"); 
+                if ($hastrans) @pg_exec($this->_connectionID,"commit"); 
                 return $realblob;
-        } 
+        }
         
         /* 
@@ -366 +422 @@
         function BlobEncode($blob)
         {
-                if (ADODB_PHPVER >= 0x4200 && ADODB_PHPVER < 0x5000) return pg_escape_bytea($blob);
                 
                 /*92=backslash, 0=null, 39=single-quote*/
@@ -376 +431 @@
         }
         
+        // assumes bytea for blob, and varchar for clob
         function UpdateBlob($table,$column,$val,$where,$blobtype='BLOB')
         {
+        
+                if ($blobtype == 'CLOB') {
+                return $this->Execute("UPDATE $table SET $column=" . $this->qstr($val) . " WHERE $where");
+                }
                 // do not use bind params which uses qstr(), as blobencode() already quotes data
                 return $this->Execute("UPDATE $table SET $column='".$this->BlobEncode($val)."'::bytea WHERE $where");
@@ -385 +445 @@
         {               
                 if (!$date) $date = $this->sysDate;
+                else if (strncmp($date,"'",1) == 0) {
+                        $len = strlen($date);
+                        if (10 <= $len && $len <= 12) $date = 'date '.$date;
+                        else $date = 'timestamp '.$date;
+                }
                 return "($date+interval'$dayFraction days')";
         }
@@ -391 +456 @@
         // for schema support, pass in the $table param "$schema.$tabname".
         // converts field names to lowercase, $upper is ignored
+        // see http://phplens.com/lens/lensforum/msgs.php?id=14018 for more info
         function &MetaColumns($table,$normalize=true) 
         {
@@ -396 +462 @@
         
                 $schema = false;
+                $false = false;
                 $this->_findschema($table,$schema);
                 
@@ -409 +476 @@
                 $ADODB_FETCH_MODE = $save;
                 
-                if ($rs === false) return false;
-                
+                if ($rs === false) {
+                        return $false;
+                }
                 if (!empty($this->metaKeySQL)) {
                         // If we want the primary keys, we have to issue a separate query
@@ -461 +529 @@
                         $fld->type = $rs->fields[1];
                         $fld->max_length = $rs->fields[2];
+                        $fld->attnum = $rs->fields[6];
+                        
                         if ($fld->max_length <= 0) $fld->max_length = $rs->fields[3]-4;
                         if ($fld->max_length <= 0) $fld->max_length = -1;
-                        
+                        if ($fld->type == 'numeric') {
+                                $fld->scale = $fld->max_length & 0xFFFF;
+                                $fld->max_length >>= 16;
+                        }
                         // dannym
                         // 5 hasdefault; 6 num-of-column
@@ -472 +545 @@
 
                         //Freek
-                        if ($rs->fields[4] == $this->true) {
-                                $fld->not_null = true;
-                        }
+                        $fld->not_null = $rs->fields[4] == 't';
+                        
                         
                         // Freek
                         if (is_array($keys)) {
                                 foreach($keys as $key) {
-                                        if ($fld->name == $key['column_name'] AND $key['primary_key'] == $this->true) 
+                                        if ($fld->name == $key['column_name'] AND $key['primary_key'] == 't') 
                                                 $fld->primary_key = true;
-                                        if ($fld->name == $key['column_name'] AND $key['unique_key'] == $this->true) 
+                                        if ($fld->name == $key['column_name'] AND $key['unique_key'] == 't') 
                                                 $fld->unique = true; // What name is more compatible?
                                 }
@@ -492 +564 @@
                 }
                 $rs->Close();
-                return $retarr; 
+                if (empty($retarr))
+                        return  $false;
+                else
+                        return $retarr; 
                 
         }
@@ -510 +585 @@
 JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
         ,pg_namespace n 
-WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\' AND i.indisprimary=false';
+WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\')) and c.relnamespace=c2.relnamespace and c.relnamespace=n.oid and n.nspname=\'%s\'';
                                 } else {
                         $sql = '
@@ -517 +592 @@
 JOIN pg_catalog.pg_index i ON i.indexrelid=c.oid
 JOIN pg_catalog.pg_class c2 ON c2.oid=i.indrelid
-WHERE c2.relname=\'%s\' or c2.relname=lower(\'%s\')';
+WHERE (c2.relname=\'%s\' or c2.relname=lower(\'%s\'))';
                         }
                                             
@@ -537 +612 @@
 
                 if (!is_object($rs)) {
-                        return FALSE;
+                        $false = false;
+                                        return $false;
                 }
                                 
-                $col_names = $this->MetaColumnNames($table,true);
+                $col_names = $this->MetaColumnNames($table,true,true); 
+                                //3rd param is use attnum, 
+                                // see http://sourceforge.net/tracker/index.php?func=detail&aid=1451245&group_id=42718&atid=433976
                 $indexes = array();
                 while ($row = $rs->FetchRow()) {
                         $columns = array();
                         foreach (explode(' ', $row[2]) as $col) {
-                                $columns[] = $col_names[$col - 1];
+                                $columns[] = $col_names[$col];
                         }
                         
@@ -564 +642 @@
         {
                 
-                if (!function_exists('pg_pconnect')) return null;
+                if (!function_exists('pg_connect')) return null;
                 
                 $this->_errorMsg = false;
@@ -576 +654 @@
                                 $host = split(":", $str);
                                 if ($host[0]) $str = "host=".adodb_addslashes($host[0]);
-                                else $str = 'host=localhost';
+                                else $str = '';
                                 if (isset($host[1])) $str .= " port=$host[1]";
+                                else if (!empty($this->port)) $str .= " port=".$this->port;
                         }
                                 if ($user) $str .= " user=".$user;
@@ -601 +680 @@
                 if ($this->_connectionID === false) return false;
                 $this->Execute("set datestyle='ISO'");
+                
+                $info = $this->ServerInfo();
+                $this->pgVersion = (float) substr($info['version'],0,3);
+                if ($this->pgVersion >= 7.1) { // good till version 999
+                        $this->_nestedSQL = true;
+                }
                 return true;
         }
@@ -623 +708 @@
         function _query($sql,$inputarr)
         {
-                
+                $this->_errorMsg = false;
                 if ($inputarr) {
                 /*
@@ -652 +737 @@
                         if ($execp) $exsql = "EXECUTE $plan ($execp)";
                         else $exsql = "EXECUTE $plan";
+                        
                         
                         $rez = @pg_exec($this->_connectionID,$exsql);
@@ -677 +763 @@
                                 $s = "PREPARE $plan ($params) AS ".substr($sql,0,strlen($sql)-2);               
                                 //adodb_pr($s);
-                                pg_exec($this->_connectionID,$s);
-                                echo $this->ErrorMsg();
-                        }
-                        
-                        $rez = pg_exec($this->_connectionID,$exsql);
+                                $rez = pg_exec($this->_connectionID,$s);
+                                //echo $this->ErrorMsg();
+                        }
+                        if ($rez)
+                                $rez = pg_exec($this->_connectionID,$exsql);
                 } else {
-                        $this->_errorMsg = false;
                         //adodb_backtrace();
                         $rez = pg_exec($this->_connectionID,$sql);
@@ -699 +784 @@
         }
         
+        function _errconnect()
+        {
+                if (defined('DB_ERROR_CONNECT_FAILED')) return DB_ERROR_CONNECT_FAILED;
+                else return 'Database connection failed';
+        }
 
         /*      Returns: the last error message from previous database operation        */      
@@ -712 +802 @@
                         if (!empty($this->_connectionID)) {
                                 $this->_errorMsg = @pg_last_error($this->_connectionID);
-                        } else $this->_errorMsg = @pg_last_error();
+                        } else $this->_errorMsg = $this->_errconnect();
                 } else {
-                        if (empty($this->_connectionID)) $this->_errorMsg = @pg_errormessage();
+                        if (empty($this->_connectionID)) $this->_errconnect();
                         else $this->_errorMsg = @pg_errormessage($this->_connectionID);
                 }
@@ -780 +870 @@
                 case ADODB_FETCH_NUM: $this->fetchMode = PGSQL_NUM; break;
                 case ADODB_FETCH_ASSOC:$this->fetchMode = PGSQL_ASSOC; break;
-                default:
+                
                 case ADODB_FETCH_DEFAULT:
-                case ADODB_FETCH_BOTH:$this->fetchMode = PGSQL_BOTH; break;
-                }
+                case ADODB_FETCH_BOTH:
+                default: $this->fetchMode = PGSQL_BOTH; break;
+                }
+                $this->adodbFetchMode = $mode;
                 $this->ADORecordSet($queryID);
         }
@@ -802 +894 @@
                 
                 // cache types for blob decode check
+                // apparently pg_fieldtype actually performs an sql query on the database to get the type.
+                if (empty($this->connection->noBlobs))
                 for ($i=0, $max = $this->_numOfFields; $i < $max; $i++) {  
                         if (pg_fieldtype($qid,$i) == 'bytea') {
@@ -886 +980 @@
                 $this->fields = @pg_fetch_array($this->_queryID,$this->_currentRow,$this->fetchMode);
                 
-        if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
+                if ($this->fields && isset($this->_blobArr)) $this->_fixblobs();
                         
                 return (is_array($this->fields));
@@ -912 +1006 @@
                                 case 'BPCHAR':
                                 case '_VARCHAR':
+                                case 'INET':
+                                case 'MACADDR':
                                         if ($len <= $this->blobSize) return 'C';
                                 
@@ -931 +1027 @@
                                         return 'D';
                                 
+                                
+                                case 'TIMESTAMP WITHOUT TIME ZONE':
                                 case 'TIME':
                                 case 'DATETIME':