[Wact-cvs] wact/framework/db db.inc.php,1.3,1.4

[<jef...@us...>]

Update of /cvsroot/wact/wact/framework/db
In directory sc8-pr-cvs1:/tmp/cvs-serv6643

Modified Files:
	db.inc.php 
Log Message:
Fixed many bugs in the new database drivers


Index: db.inc.php
===================================================================
RCS file: /cvsroot/wact/wact/framework/db/db.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** db.inc.php	30 Sep 2003 06:54:05 -0000	1.3
--- db.inc.php	30 Sep 2003 19:21:22 -0000	1.4
***************
*** 29,33 ****
      * @access public
      */
!     function getCurrentConnection() {
          if (!isset($GLOBALS['DatabaseConnectionObj'])) {
              $driver = getConfigOption('config', 'database', 'driver');
--- 29,33 ----
      * @access public
      */
!     function &getCurrentConnection() {
          if (!isset($GLOBALS['DatabaseConnectionObj'])) {
              $driver = getConfigOption('config', 'database', 'driver');
***************
*** 47,51 ****
      */
      function &NewRecord($DataSpace = NULL) {
!         $connection = DBC::getCurrentConnection();
          $Record =& new $GLOBALS['DatabaseRecordClass']($connection);
          if (!is_null($DataSpace)) {
--- 47,51 ----
      */
      function &NewRecord($DataSpace = NULL) {
!         $connection =& DBC::getCurrentConnection();
          $Record =& new $GLOBALS['DatabaseRecordClass']($connection);
          if (!is_null($DataSpace)) {
***************
*** 66,73 ****
      */
      function &NewRecordSet($query, $filter = NULL) {
!         $connection = DBC::getCurrentConnection();
          $RecordSet =& new $GLOBALS['DatabaseRecordSetClass']($connection, $query);
          if (!is_null($filter)) {
-             $RecordSet->query($query);
              $RecordSet->registerFilter($filter);
          }
--- 66,72 ----
      */
      function &NewRecordSet($query, $filter = NULL) {
!         $connection =& DBC::getCurrentConnection();
          $RecordSet =& new $GLOBALS['DatabaseRecordSetClass']($connection, $query);
          if (!is_null($filter)) {
              $RecordSet->registerFilter($filter);
          }
***************
*** 99,103 ****
  	*/
      function getOneColumnArray($query) {
!         $connection = DBC::getCurrentConnection();
          return $connection->getOneColumnArray($query);
      }
--- 98,102 ----
  	*/
      function getOneColumnArray($query) {
!         $connection =& DBC::getCurrentConnection();
          return $connection->getOneColumnArray($query);
      }
***************
*** 110,114 ****
  	*/
      function getTwoColumnArray($query) {
!         $connection = DBC::getCurrentConnection();
          return $connection->getTwoColumnArray($query);
      }
--- 109,113 ----
  	*/
      function getTwoColumnArray($query) {
!         $connection =& DBC::getCurrentConnection();
          return $connection->getTwoColumnArray($query);
      }
***************
*** 120,124 ****
  	*/
      function &FindRecord($query) {
!         $connection = DBC::getCurrentConnection();
          return $connection->FindRecord($value, $type);
      }
--- 119,123 ----
  	*/
      function &FindRecord($query) {
!         $connection =& DBC::getCurrentConnection();
          return $connection->FindRecord($value, $type);
      }
***************
*** 131,135 ****
  	*/
      function getOneValue($query) {
!         $connection = DBC::getCurrentConnection();
          return $connection->getOneValue($query);
      }
--- 130,134 ----
  	*/
      function getOneValue($query) {
!         $connection =& DBC::getCurrentConnection();
          return $connection->getOneValue($query);
      }
***************
*** 142,146 ****
  	*/
      function execute($query) {
!         $connection = DBC::getCurrentConnection();
          return $connection->execute($query);
      }
--- 141,145 ----
  	*/
      function execute($query) {
!         $connection =& DBC::getCurrentConnection();
          return $connection->execute($query);
      }
***************
*** 155,159 ****
  	*/
      function makeLiteral($value, $type = NULL) {
!         $connection = DBC::getCurrentConnection();
          return $connection->makeLiteral($value, $type);
      }
--- 154,158 ----
  	*/
      function makeLiteral($value, $type = NULL) {
!         $connection =& DBC::getCurrentConnection();
          return $connection->makeLiteral($value, $type);
      }