phpOpenTracker/phpOpenTracker/Database/Driver MSSQL.php,1.11,1.12 MySQL.php,1.11,1.12 MySQL_Merge.php,1.5,1.6 Oracle.php,1.11,1.12 PostgreSQL.php,1.11,1.12

Update of /cvsroot/phpopencounter/phpOpenTracker/phpOpenTracker/Database/Driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31597/phpOpenTracker/Database/Driver

Modified Files:
	MSSQL.php MySQL.php MySQL_Merge.php Oracle.php PostgreSQL.php 
Log Message:
Rename prepareQuery() to rewriteQuery() to prevent confusion with prepared statements.

Index: MySQL.php
===================================================================
RCS file: /cvsroot/phpopencounter/phpOpenTracker/phpOpenTracker/Database/Driver/MySQL.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MySQL.php	27 Feb 2004 08:09:08 -0000	1.11
--- MySQL.php	3 Mar 2004 17:15:07 -0000	1.12
***************
*** 47,51 ****
      }
  
!     protected function prepareQuery(&$query, $parameters, $isManip) {
          if (!$isManip && $parameters['limit'] !== false) {
              $query .= ' LIMIT ' . $parameters['limit'];
--- 47,51 ----
      }
  
!     protected function rewriteQuery(&$query, $parameters, $isManip) {
          if (!$isManip && $parameters['limit'] !== false) {
              $query .= ' LIMIT ' . $parameters['limit'];

Index: PostgreSQL.php
===================================================================
RCS file: /cvsroot/phpopencounter/phpOpenTracker/phpOpenTracker/Database/Driver/PostgreSQL.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PostgreSQL.php	27 Feb 2004 08:09:08 -0000	1.11
--- PostgreSQL.php	3 Mar 2004 17:15:07 -0000	1.12
***************
*** 66,70 ****
      }
  
!     protected function prepareQuery(&$query, $parameters, $isManip) {
          if (!$isManip && $parameters['limit'] !== false) {
              $query .= ' LIMIT ' . $parameters['limit'];
--- 66,70 ----
      }
  
!     protected function rewriteQuery(&$query, $parameters, $isManip) {
          if (!$isManip && $parameters['limit'] !== false) {
              $query .= ' LIMIT ' . $parameters['limit'];

Index: MSSQL.php
===================================================================
RCS file: /cvsroot/phpopencounter/phpOpenTracker/phpOpenTracker/Database/Driver/MSSQL.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** MSSQL.php	27 Feb 2004 08:09:08 -0000	1.11
--- MSSQL.php	3 Mar 2004 17:15:07 -0000	1.12
***************
*** 47,51 ****
      }
  
!     protected function prepareQuery(&$query, $parameters, $isManip) {
          if (!$isManip && $parameters['limit'] !== false) {
              $query = str_replace(
--- 47,51 ----
      }
  
!     protected function rewriteQuery(&$query, $parameters, $isManip) {
          if (!$isManip && $parameters['limit'] !== false) {
              $query = str_replace(

Index: MySQL_Merge.php
===================================================================
RCS file: /cvsroot/phpopencounter/phpOpenTracker/phpOpenTracker/Database/Driver/MySQL_Merge.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MySQL_Merge.php	29 Feb 2004 10:39:08 -0000	1.5
--- MySQL_Merge.php	3 Mar 2004 17:15:07 -0000	1.6
***************
*** 55,60 ****
                            ) %s';
  
!     protected function prepareQuery(&$query, $parameters, $isManip) {
!         parent::prepareQuery($query, $parameters, $isManip);
      }
  }
--- 55,60 ----
                            ) %s';
  
!     protected function rewriteQuery(&$query, $parameters, $isManip) {
!         parent::rewriteQuery($query, $parameters, $isManip);
      }
  }

Index: Oracle.php
===================================================================
RCS file: /cvsroot/phpopencounter/phpOpenTracker/phpOpenTracker/Database/Driver/Oracle.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Oracle.php	27 Feb 2004 08:09:08 -0000	1.11
--- Oracle.php	3 Mar 2004 17:15:07 -0000	1.12
***************
*** 43,47 ****
      }
  
!     protected function prepareQuery(&$query, $parameters, $isManip) {
          if (!$isManip && $parameters['limit'] !== false) {
              $query = sprintf(
--- 43,47 ----
      }
  
!     protected function rewriteQuery(&$query, $parameters, $isManip) {
          if (!$isManip && $parameters['limit'] !== false) {
              $query = sprintf(



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click