diff options
| author | Lester Caine <lester@lsces.co.uk> | 2005-06-19 08:07:25 +0000 |
|---|---|---|
| committer | Lester Caine <lester@lsces.co.uk> | 2005-06-19 08:07:25 +0000 |
| commit | e4f9d9eb97d53ec8a41b82aa48686a81b05615c9 (patch) | |
| tree | 70a9ec75e45218c65186eb7a2c1ddd4773904ef1 | |
| parent | a4f86515b4553ec209a154df15501d6749161e98 (diff) | |
| download | kernel-e4f9d9eb97d53ec8a41b82aa48686a81b05615c9.tar.gz kernel-e4f9d9eb97d53ec8a41b82aa48686a81b05615c9.tar.bz2 kernel-e4f9d9eb97d53ec8a41b82aa48686a81b05615c9.zip | |
Update firebird port to ADOdb4.63 - use ADOdb drivers
| -rwxr-xr-x | BitDb.php | 14 | ||||
| -rwxr-xr-x | BitSystem.php | 6 |
2 files changed, 10 insertions, 10 deletions
@@ -1,6 +1,6 @@ <?php /** -* $Header: /cvsroot/bitweaver/_bit_kernel/Attic/BitDb.php,v 1.1 2005/06/19 04:52:53 bitweaver Exp $ +* $Header: /cvsroot/bitweaver/_bit_kernel/Attic/BitDb.php,v 1.2 2005/06/19 08:07:25 lsces Exp $ * * Copyright (c) 2004 bitweaver.org * Copyright (c) 2003 tikwiki.org @@ -8,7 +8,7 @@ * All Rights Reserved. See copyright.txt for details and a complete list of authors. * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details * -* $Id: BitDb.php,v 1.1 2005/06/19 04:52:53 bitweaver Exp $ +* $Id: BitDb.php,v 1.2 2005/06/19 08:07:25 lsces Exp $ */ // ensure your AdoDB install is a subdirectory off your include path @@ -27,7 +27,7 @@ define( 'BIT_QUERY_DEFAULT', -1 ); * * @author spider <spider@steelsun.com> * -* @version $Revision: 1.1 $ $Date: 2005/06/19 04:52:53 $ $Author: bitweaver $ +* @version $Revision: 1.2 $ $Date: 2005/06/19 08:07:25 $ $Author: lsces $ * * @class BitDb */ @@ -557,7 +557,7 @@ class BitDb } $pQuery .= $qe[$i]; break; - case "firebird15": + case "firebird": case "mssql": case "pgsql": case "sybase": @@ -587,7 +587,7 @@ class BitDb "mysql3" => "RAND()", "mysql" => "RAND()", "mssql" => "NEWID()", - "firebird15" => "1")); + "firebird" => "1")); //"oci8" => "" STILL NEEDED //"sqlite" => "" STILL NEEDED //"sybase" => "" STILL NEEDED @@ -604,7 +604,7 @@ class BitDb if (!$bIsFunction) { switch ($this->mType) { - case "firebird15": + case "firebird": if ( $pSortMode == 'page_name_asc' ) $pSortMode = 'title_asc'; if ( $pSortMode == 'page_name_desc' ) $pSortMode = 'title_desc'; case "oci8": @@ -638,7 +638,7 @@ class BitDb switch ($this->mType) { case "oci8": - case "firebird15": + case "firebird": case "sqlite": break; case "mysql3": diff --git a/BitSystem.php b/BitSystem.php index d51091e..e7a5789 100755 --- a/BitSystem.php +++ b/BitSystem.php @@ -14,7 +14,7 @@ // +----------------------------------------------------------------------+ // | Authors: spider <spider@steelsun.com> // +----------------------------------------------------------------------+ -// $Id: BitSystem.php,v 1.1 2005/06/19 04:52:52 bitweaver Exp $ +// $Id: BitSystem.php,v 1.2 2005/06/19 08:07:25 lsces Exp $ /** * kernel::BitSystem * @@ -29,7 +29,7 @@ * is Package specific should be moved into that package * * @author spider <spider@steelsun.com> -* @version $Revision: 1.1 $ +* @version $Revision: 1.2 $ * @access public */ @@ -1246,7 +1246,7 @@ if( !$tablePresent ) { // This saves a count() query to see if the ACTIVE_PACKAGE has a layout, since it usually probably doesn't // I don't know if it's better or not to save the count() query and retrieve more data - my gut says so, // but i've done no research - spiderr - if ($pLayout != DEFAULT_PACKAGE && $pFallback && $this->mDb->mType != 'firebird15') { + if ($pLayout != DEFAULT_PACKAGE && $pFallback && $this->mDb->mType != 'firebird') { // ORDER BY comparison is crucial so current layout modules come up first $whereClause .= " (tl.`layout`=? OR tl.`layout`=? ) ORDER BY tl.`layout`=? DESC, "; array_push($bindVars, $pLayout); |
