[Jaws-commits] r13206 - in trunk/jaws/html/libraries/pear/MDB2/Driver: . Datatype Manager

afz at jaws-project.com afz at jaws-project.com
Thu Aug 2 17:04:43 UTC 2012


Author: afz
Date: 2012-08-02 17:04:43 +0000 (Thu, 02 Aug 2012)
New Revision: 13206

Modified:
   trunk/jaws/html/libraries/pear/MDB2/Driver/Datatype/Common.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/Common.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/fbsql.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/ibase.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mssql.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mysql.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mysqli.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/oci8.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/pgsql.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/sqlite.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/sqlsrv.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/fbsql.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/ibase.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/mssql.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/mysql.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/mysqli.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/oci8.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/pgsql.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/sqlite.php
   trunk/jaws/html/libraries/pear/MDB2/Driver/sqlsrv.php
Log:
revert MDB2 changes, because not backward compatible

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Datatype/Common.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Datatype/Common.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Datatype/Common.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -263,11 +263,7 @@
      */
     function convertResultRow($types, $row, $rtrim = true)
     {
-        //$types = $this->_sortResultFieldTypes(array_keys($row), $types);
-        $keys = array_keys($row);
-        if (is_int($keys[0])) {
-            $types = $this->_sortResultFieldTypes($keys, $types);
-        }
+        $types = $this->_sortResultFieldTypes(array_keys($row), $types);
         foreach ($row as $key => $value) {
             if (empty($types[$key])) {
                 continue;

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/Common.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/Common.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/Common.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -385,11 +385,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("DROP TABLE $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP TABLE $name");
     }
 
     // }}}
@@ -411,11 +407,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("DELETE FROM $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DELETE FROM $name");
     }
 
     // }}}
@@ -769,11 +761,7 @@
             $fields[] = $db->quoteIdentifier($field, true);
         }
         $query .= ' ('. implode(', ', $fields) . ')';
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -795,11 +783,7 @@
         }
 
         $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $result = $db->exec("DROP INDEX $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP INDEX $name");
     }
 
     // }}}
@@ -911,11 +895,7 @@
             $query .= ' ('. implode(', ', $referenced_fields) . ')';
             $query .= $this->_getAdvancedFKOptions($definition);
         }
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -939,11 +919,7 @@
 
         $table = $db->quoteIdentifier($table, true);
         $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $result = $db->exec("ALTER TABLE $table DROP CONSTRAINT $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("ALTER TABLE $table DROP CONSTRAINT $name");
     }
 
     // }}}
@@ -1035,4 +1011,4 @@
 
     // }}}
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/fbsql.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/fbsql.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/fbsql.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -120,11 +120,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("DROP TABLE $name CASCADE");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP TABLE $name CASCADE");
     }
 
     // }}}
@@ -309,11 +305,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("ALTER TABLE $name $query");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("ALTER TABLE $name $query");
     }
 
     // }}}
@@ -440,11 +432,7 @@
 
         $table = $db->quoteIdentifier($table, true);
         $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $result = $db->exec("ALTER TABLE $table DROP INDEX $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("ALTER TABLE $table DROP INDEX $name");
     }
 
     // }}}
@@ -554,11 +542,7 @@
         }
 
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $result = $db->exec("DROP TABLE $sequence_name CASCADE");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP TABLE $sequence_name CASCADE");
     }
 
     // }}}
@@ -594,4 +578,4 @@
     }
     // }}}
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/ibase.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/ibase.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/ibase.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -399,9 +399,6 @@
             return $result;
         }
         $result = parent::dropTable($name);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
         $this->_silentCommit();
         return $result;
     }
@@ -601,11 +598,8 @@
 
         $name = $db->quoteIdentifier($name, true);
         $result = $db->exec("ALTER TABLE $name $query");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
         $this->_silentCommit();
-        return MDB2_OK;
+        return $result;
     }
 
     // }}}
@@ -876,11 +870,8 @@
         }
         $query .= ' ('.implode(', ', $fields) . ')';
         $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
         $this->_silentCommit();
-        return MDB2_OK;
+        return $result;
     }
 
     // }}}
@@ -991,11 +982,8 @@
             $query .= $this->_getAdvancedFKOptions($definition);
         }
         $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
         $this->_silentCommit();
-        return MDB2_OK;
+        return $result;
     }
 
     // }}}
@@ -1071,7 +1059,7 @@
                     'Could not setup sequence start value and then it was not possible to drop it', __FUNCTION__);
             }
         }
-        return MDB2_OK;
+        return $result;
     }
 
     // }}}
@@ -1095,11 +1083,7 @@
         $sequence_name = $db->getSequenceName($seq_name);
         $sequence_name = $db->quote($sequence_name, 'text');
         $query = "DELETE FROM RDB\$GENERATORS WHERE UPPER(RDB\$GENERATOR_NAME)=$sequence_name";
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -1133,4 +1117,4 @@
         return $result;
     }
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mssql.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mssql.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mssql.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -251,11 +251,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("TRUNCATE TABLE $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("TRUNCATE TABLE $name");
     }
 
     // }}}
@@ -291,11 +287,7 @@
             return $result;
         }
 
-        $result = $db->exec('EXEC NSVacuum '.$timeout);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec('EXEC NSVacuum '.$timeout);
     }
 
     // }}}
@@ -982,11 +974,7 @@
 
         $table = $db->quoteIdentifier($table, true);
         $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $result = $db->exec("DROP INDEX $table.$name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP INDEX $table.$name");
     }
 
     // }}}
@@ -1097,11 +1085,7 @@
         }
 
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $result = $db->exec("DROP TABLE $sequence_name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP TABLE $sequence_name");
     }
 
     // }}}
@@ -1142,4 +1126,4 @@
 }
 
 // }}}
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mysql.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mysql.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mysql.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -327,11 +327,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("TRUNCATE TABLE $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("TRUNCATE TABLE $name");
     }
 
     // }}}
@@ -378,10 +374,7 @@
             return $result;
         }
         if (!empty($options['analyze'])) {
-            $result = $db->exec('ANALYZE TABLE '.$table);
-            if (MDB2::isError($result)) {
-                return $result;
-            }
+            return $db->exec('ANALYZE TABLE '.$table);
         }
         return MDB2_OK;
     }
@@ -568,11 +561,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("ALTER TABLE $name $query");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("ALTER TABLE $name $query");
     }
 
     // }}}
@@ -843,11 +832,7 @@
             }
         }
         $query .= ' ('. implode(', ', $fields) . ')';
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -870,11 +855,7 @@
 
         $table = $db->quoteIdentifier($table, true);
         $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $result = $db->exec("DROP INDEX $name ON $table");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP INDEX $name ON $table");
     }
 
     // }}}
@@ -1034,11 +1015,7 @@
 
         if ($primary || strtolower($name) == 'primary') {
             $query = 'ALTER TABLE '. $db->quoteIdentifier($table, true) .' DROP PRIMARY KEY';
-            $result = $db->exec($query);
-            if (MDB2::isError($result)) {
-                return $result;
-            }
-            return MDB2_OK;
+            return $db->exec($query);
         }
 
         //is it a FK constraint? If so, also delete the associated triggers
@@ -1054,21 +1031,13 @@
             $table = $db->quoteIdentifier($table, true);
             $name = $db->quoteIdentifier($db->getIndexName($name), true);
             $query = "ALTER TABLE $table DROP FOREIGN KEY $name";
-            $result = $db->exec($query);
-            if (MDB2::isError($result)) {
-                return $result;
-            }
-            return MDB2_OK;
+            return $db->exec($query);
         }
 
         $table = $db->quoteIdentifier($table, true);
         $name = $db->quoteIdentifier($db->getIndexName($name), true);
         $query = "ALTER TABLE $table DROP INDEX $name";
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -1421,11 +1390,7 @@
         }
 
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $result = $db->exec("DROP TABLE $sequence_name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP TABLE $sequence_name");
     }
 
     // }}}
@@ -1468,4 +1433,4 @@
 
     // }}}
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mysqli.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mysqli.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/mysqli.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -327,11 +327,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("TRUNCATE TABLE $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("TRUNCATE TABLE $name");
     }
 
     // }}}
@@ -378,10 +374,7 @@
             return $result;
         }
         if (!empty($options['analyze'])) {
-            $result = $db->exec('ANALYZE TABLE '.$table);
-            if (MDB2::isError($result)) {
-                return $result;
-            }
+            return $db->exec('ANALYZE TABLE '.$table);
         }
         return MDB2_OK;
     }
@@ -568,11 +561,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("ALTER TABLE $name $query");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("ALTER TABLE $name $query");
     }
 
     // }}}
@@ -843,11 +832,7 @@
             }
         }
         $query .= ' ('. implode(', ', $fields) . ')';
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -870,11 +855,7 @@
 
         $table = $db->quoteIdentifier($table, true);
         $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $result = $db->exec("DROP INDEX $name ON $table");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP INDEX $name ON $table");
     }
 
     // }}}
@@ -1034,11 +1015,7 @@
         
         if ($primary || strtolower($name) == 'primary') {
             $query = 'ALTER TABLE '. $db->quoteIdentifier($table, true) .' DROP PRIMARY KEY';
-            $result = $db->exec($query);
-            if (MDB2::isError($result)) {
-                return $result;
-            }
-            return MDB2_OK;
+            return $db->exec($query);
         }
         
         //is it a FK constraint? If so, also delete the associated triggers
@@ -1054,21 +1031,13 @@
             $table = $db->quoteIdentifier($table, true);
             $name = $db->quoteIdentifier($db->getIndexName($name), true);
             $query = "ALTER TABLE $table DROP FOREIGN KEY $name";
-            $result = $db->exec($query);
-            if (MDB2::isError($result)) {
-                return $result;
-            }
-            return MDB2_OK;
+            return $db->exec($query);
         }
 
         $table = $db->quoteIdentifier($table, true);
         $name = $db->quoteIdentifier($db->getIndexName($name), true);
         $query = "ALTER TABLE $table DROP INDEX $name";
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -1421,11 +1390,7 @@
         }
 
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $result = $db->exec("DROP TABLE $sequence_name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP TABLE $sequence_name");
     }
 
     // }}}
@@ -1468,4 +1433,4 @@
 
     // }}}
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/oci8.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/oci8.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/oci8.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -444,9 +444,6 @@
         $result = $this->_dropAutoincrement($name);
         if (!PEAR::isError($result)) {
             $result = parent::dropTable($name);
-            if (MDB2::isError($result)) {
-                return $result;
-            }
         }
         $db->completeNestedTransaction();
         return $result;
@@ -471,11 +468,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("TRUNCATE TABLE $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("TRUNCATE TABLE $name");
     }
 
     // }}}
@@ -1269,11 +1262,7 @@
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
         $query = "CREATE SEQUENCE $sequence_name START WITH $start INCREMENT BY 1 NOCACHE";
         $query.= ($start < 1 ? " MINVALUE $start" : '');
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -1295,11 +1284,7 @@
         }
 
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $result = $db->exec("DROP SEQUENCE $sequence_name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP SEQUENCE $sequence_name");
     }
 
     // }}}
@@ -1352,4 +1337,4 @@
         return $col;
     }
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/pgsql.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/pgsql.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/pgsql.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -193,11 +193,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("TRUNCATE TABLE $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("TRUNCATE TABLE $name");
     }
 
     // }}}
@@ -238,11 +234,7 @@
         if (!empty($table)) {
             $query .= ' '.$db->quoteIdentifier($table, true);
         }
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -809,19 +801,11 @@
         }
 
         if (in_array($name, $unique)) {
-            $result = $db->exec('DROP INDEX '.$db->quoteIdentifier($name, true));
-            if (MDB2::isError($result)) {
-                return $result;
-            }
-            return MDB2_OK;
+            return $db->exec('DROP INDEX '.$db->quoteIdentifier($name, true));
         }
         $idxname = $db->getIndexName($name);
         if (in_array($idxname, $unique)) {
-            $result = $db->exec('DROP INDEX '.$db->quoteIdentifier($idxname, true));
-            if (MDB2::isError($result)) {
-                return $result;
-            }
-            return MDB2_OK;
+            return $db->exec('DROP INDEX '.$db->quoteIdentifier($idxname, true));
         }
         return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
             $name . ' is not an existing constraint for table ' . $table, __FUNCTION__);
@@ -910,12 +894,8 @@
         }
 
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $result = $db->exec("CREATE SEQUENCE $sequence_name INCREMENT 1".
+        return $db->exec("CREATE SEQUENCE $sequence_name INCREMENT 1".
             ($start < 1 ? " MINVALUE $start" : '')." START $start");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
     }
 
     // }}}
@@ -936,11 +916,7 @@
         }
 
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $result = $db->exec("DROP SEQUENCE $sequence_name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP SEQUENCE $sequence_name");
     }
 
     // }}}
@@ -975,4 +951,4 @@
         return $result;
     }
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/sqlite.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/sqlite.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/sqlite.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -405,11 +405,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("DROP TABLE $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP TABLE $name");
     }
 
     // }}}
@@ -440,11 +436,7 @@
         if (!empty($table)) {
             $query .= ' '.$db->quoteIdentifier($table, true);
         }
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -990,11 +982,7 @@
             $fields[] = $field_string;
         }
         $query .= ' ('.implode(', ', $fields) . ')';
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -1016,11 +1004,7 @@
         }
 
         $name = $db->getIndexName($name);
-        $result = $db->exec("DROP INDEX $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP INDEX $name");
     }
 
     // }}}
@@ -1128,11 +1112,7 @@
             $fields[] = $field_string;
         }
         $query .= ' ('.implode(', ', $fields) . ')';
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}
@@ -1172,11 +1152,7 @@
         }
 
         $name = $db->getIndexName($name);
-        $result = $db->exec("DROP INDEX $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP INDEX $name");
     }
 
     // }}}
@@ -1345,11 +1321,7 @@
         }
 
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $result = $db->exec("DROP TABLE $sequence_name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP TABLE $sequence_name");
     }
 
     // }}}
@@ -1387,4 +1359,4 @@
 
     // }}}
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/sqlsrv.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/sqlsrv.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/Manager/sqlsrv.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -161,11 +161,7 @@
             return $db;
         }
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='$name') DROP TABLE $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("IF EXISTS (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='$name') DROP TABLE $name");
     }
 
     // }}}
@@ -272,11 +268,7 @@
         }
 
         $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("TRUNCATE TABLE $name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("TRUNCATE TABLE $name");
     }
 
     // }}}
@@ -312,11 +304,7 @@
             return $result;
         }
 
-        $result = $db->exec('EXEC NSVacuum '.$timeout);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec('EXEC NSVacuum '.$timeout);
     }
 
     // }}}
@@ -1003,11 +991,7 @@
 
         $table = $db->quoteIdentifier($table, true);
         $name = $db->quoteIdentifier($db->getIndexName($name), true);
-        $result = $db->exec("DROP INDEX $table.$name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP INDEX $table.$name");
     }
 
     // }}}
@@ -1165,11 +1149,7 @@
         }
 
         $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
-        $result = $db->exec("DROP TABLE $sequence_name");
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec("DROP TABLE $sequence_name");
     }
 
     // }}}
@@ -1405,11 +1385,7 @@
             $query .= ' ('. implode(', ', $referenced_fields) . ')';
             $query .= $this->_getAdvancedFKOptions($definition);
         }
-        $result = $db->exec($query);
-        if (MDB2::isError($result)) {
-            return $result;
-        }
-        return MDB2_OK;
+        return $db->exec($query);
     }
 
     // }}}

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/fbsql.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/fbsql.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/fbsql.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -671,9 +671,7 @@
         if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
             $fetchmode = $this->db->fetchmode;
         }
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             $row = @fbsql_fetch_assoc($this->result);
             if (is_array($row)
                 && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
@@ -696,10 +694,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (($fetchmode != MDB2_FETCHMODE_ASSOC) && !empty($this->types)) {
-            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC) && !empty($this->types_assoc)) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
+        if (!empty($this->types)) {
+            $row = $this->db->datatype->convertResultRow($this->types, $row, false);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -911,4 +907,4 @@
 
 }
 
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/ibase.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/ibase.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/ibase.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -1097,9 +1097,7 @@
         if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
             $fetchmode = $this->db->fetchmode;
         }
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             $row = @ibase_fetch_assoc($this->result);
             if (is_array($row)
                 && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
@@ -1130,16 +1128,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
-             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
+        if (!empty($this->types)) {
+            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -1345,9 +1335,7 @@
             return $null;
         }
         $row = $this->buffer[$target_rownum];
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             $column_names = $this->getColumnNames();
             foreach ($column_names as $name => $i) {
                 $column_names[$name] = $row[$i];
@@ -1366,16 +1354,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
+        if (!empty($this->types)) {
             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -1499,7 +1479,7 @@
      *               a MDB2 error on failure
      * @access private
      */
-    function &_execute($result_class = true, $result_wrap_class = true)
+    function &_execute($result_class = true, $result_wrap_class = false)
     {
         if (null === $this->statement) {
             $result =& parent::_execute($result_class, $result_wrap_class);

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/mssql.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/mssql.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/mssql.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -911,9 +911,7 @@
         if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
             $fetchmode = $this->db->fetchmode;
         }
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             $row = @mssql_fetch_assoc($this->result);
             if (is_array($row)
                 && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
@@ -944,16 +942,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
+        if (!empty($this->types)) {
             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -1182,4 +1172,4 @@
 }
 
 // }}}
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/mysql.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/mysql.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/mysql.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -1380,9 +1380,7 @@
         if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
             $fetchmode = $this->db->fetchmode;
         }
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             $row = @mysql_fetch_assoc($this->result);
             if (is_array($row)
                 && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
@@ -1414,16 +1412,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
+        if (!empty($this->types)) {
             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -1621,7 +1611,7 @@
      *               a MDB2 error on failure
      * @access private
      */
-    function &_execute($result_class = true, $result_wrap_class = true)
+    function &_execute($result_class = true, $result_wrap_class = false)
     {
         if (is_null($this->statement)) {
             $result =& parent::_execute($result_class, $result_wrap_class);

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/mysqli.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/mysqli.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/mysqli.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -1409,9 +1409,7 @@
         if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
             $fetchmode = $this->db->fetchmode;
         }
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             $row = @mysqli_fetch_assoc($this->result);
             if (is_array($row)
                 && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
@@ -1443,16 +1441,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
+        if (!empty($this->types)) {
             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -1711,7 +1701,7 @@
      *               a MDB2 error on failure
      * @access private
      */
-    function &_execute($result_class = true, $result_wrap_class = true)
+    function &_execute($result_class = true, $result_wrap_class = false)
     {
         if (null === $this->statement) {
             $result =& parent::_execute($result_class, $result_wrap_class);
@@ -1904,4 +1894,4 @@
         return $result;
    }
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/oci8.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/oci8.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/oci8.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -593,7 +593,7 @@
             if ($is_manip) {
                 $result = $this->_affectedRows($connection, $result);
             } else {
-                $result =& $this->_wrapResult($result, $types, true, true, $limit, $offset);
+                $result =& $this->_wrapResult($result, $types, true, false, $limit, $offset);
             }
         }
 
@@ -1026,9 +1026,7 @@
         if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
             $fetchmode = $this->db->fetchmode;
         }
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             @OCIFetchInto($this->result, $row, OCI_ASSOC+OCI_RETURN_NULLS);
             if (is_array($row)
                 && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
@@ -1063,16 +1061,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
+        if (!empty($this->types)) {
             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -1270,9 +1260,7 @@
             return $null;
         }
         $row = $this->buffer[$target_rownum];
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             $column_names = $this->getColumnNames();
             foreach ($column_names as $name => $i) {
                 $column_names[$name] = $row[$i];
@@ -1291,16 +1279,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
+        if (!empty($this->types)) {
             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -1668,4 +1648,4 @@
         return $result;
     }
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/pgsql.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/pgsql.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/pgsql.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -652,7 +652,7 @@
             if ($is_manip) {
                 $result =  $this->_affectedRows($connection, $result);
             } else {
-                $result =& $this->_wrapResult($result, $types, true, true, $limit, $offset);
+                $result =& $this->_wrapResult($result, $types, true, false, $limit, $offset);
             }
         }
 
@@ -1169,7 +1169,7 @@
      * @return int data array on success, a MDB2 error on failure
      * @access public
      */
-    function fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+    function &fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
     {
         if (null !== $rownum) {
             $seek = $this->seek($rownum);
@@ -1180,9 +1180,7 @@
         if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
             $fetchmode = $this->db->fetchmode;
         }
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             $row = @pg_fetch_array($this->result, null, PGSQL_ASSOC);
             if (is_array($row)
                 && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
@@ -1213,16 +1211,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
+        if (!empty($this->types)) {
             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -1558,29 +1548,5 @@
         parent::free();
         return $result;
     }
-
-    /**
-     * drop an existing table
-     *
-     * @param string $name name of the table that should be dropped
-     * @return mixed MDB2_OK on success, a MDB2 error on failure
-     * @access public
-     */
-    function dropTable($name)
-    {
-        $db =& $this->getDBInstance();
-        if (PEAR::isError($db)) {
-            return $db;
-        }
-
-        $name = $db->quoteIdentifier($name, true);
-        $result = $db->exec("DROP TABLE $name");
-
-        if (PEAR::isError($result)) {
-            $result = $db->exec("DROP TABLE $name CASCADE");
-        }
-
-       return $result;
-    }
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/sqlite.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/sqlite.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/sqlite.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -894,9 +894,7 @@
         if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
             $fetchmode = $this->db->fetchmode;
         }
-        if (   $fetchmode == MDB2_FETCHMODE_ASSOC
-            || $fetchmode == MDB2_FETCHMODE_OBJECT
-        ) {
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
             $row = @sqlite_fetch_array($this->result, SQLITE_ASSOC);
             if (is_array($row)
                 && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
@@ -927,16 +925,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
+        if (!empty($this->types)) {
             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);
@@ -1102,4 +1092,4 @@
 {
 
 }
-?>
+?>
\ No newline at end of file

Modified: trunk/jaws/html/libraries/pear/MDB2/Driver/sqlsrv.php
===================================================================
--- trunk/jaws/html/libraries/pear/MDB2/Driver/sqlsrv.php	2012-08-02 17:03:42 UTC (rev 13205)
+++ trunk/jaws/html/libraries/pear/MDB2/Driver/sqlsrv.php	2012-08-02 17:04:43 UTC (rev 13206)
@@ -882,7 +882,10 @@
                 $o = new $this->db->options['fetch_class'];
                 $row = $this->array_to_obj($this->rows[$this->cursor], $o);
                 break;
-        }
+            default:
+            $row = $this->rows[$this->cursor] + $arrNum;
+            break;
+        } 
         $this->cursor++;
 
         /*
@@ -931,16 +934,8 @@
         if ($mode) {
             $this->db->_fixResultArrayValues($row, $mode);
         }
-        if (   (   $fetchmode != MDB2_FETCHMODE_ASSOC
-                && $fetchmode != MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types)
-        ) {
+        if (!empty($this->types)) {
             $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
-        } elseif (($fetchmode == MDB2_FETCHMODE_ASSOC
-                || $fetchmode == MDB2_FETCHMODE_OBJECT)
-            && !empty($this->types_assoc)
-        ) {
-            $row = $this->db->datatype->convertResultRow($this->types_assoc, $row, $rtrim);
         }
         if (!empty($this->values)) {
             $this->_assignBindColumns($row);



More information about the Jaws-commits mailing list