aboutsummaryrefslogtreecommitdiffstats
path: root/include/dba/dba_driver.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-11-16 15:51:42 -0800
committerfriendica <info@friendica.com>2014-11-16 15:51:42 -0800
commit1c249a5b06279ea4a19433d45a8dbe6fd71bcd25 (patch)
tree8a3f8d4bccacbf44642349c47884fe3a2c88b419 /include/dba/dba_driver.php
parent7e58bfe93169fb1ab20974967be7f61021a348aa (diff)
downloadvolse-hubzilla-1c249a5b06279ea4a19433d45a8dbe6fd71bcd25.tar.gz
volse-hubzilla-1c249a5b06279ea4a19433d45a8dbe6fd71bcd25.tar.bz2
volse-hubzilla-1c249a5b06279ea4a19433d45a8dbe6fd71bcd25.zip
some poller optimisations and a fix for undefined (empty) dbtype which shows up as a mysql error that 'rand' isn't found.
Diffstat (limited to 'include/dba/dba_driver.php')
-rwxr-xr-xinclude/dba/dba_driver.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index 103dc8fcc..1bb45b06d 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -24,7 +24,10 @@
function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) {
$dba = null;
- if($dbtype == 1) {
+
+ $dbtype = intval($dbtype);
+
+ if($dbtype == DBTYPE_POSTGRES) {
require_once('include/dba/dba_postgres.php');
if(is_null($port)) $port = 5432;
$dba = new dba_postgres($server, $port, $user, $pass, $db, $install);
@@ -39,6 +42,7 @@ function dba_factory($server, $port,$user,$pass,$db,$dbtype,$install = false) {
$dba = new dba_mysql($server, $port,$user,$pass,$db,$install);
}
}
+
define('NULL_DATE', $dba->get_null_date());
define('ACTIVE_DBTYPE', $dbtype);
return $dba;
@@ -371,7 +375,7 @@ function db_getfunc($f) {
if(isset($lookup[$f]) && isset($lookup[$f][ACTIVE_DBTYPE]))
return $lookup[$f][ACTIVE_DBTYPE];
- logger('Unable to abstract DB function "'. $f . '"', LOG_DEBUG);
+ logger('Unable to abstract DB function "'. $f . '" for dbtype ' . ACTIVE_DBTYPE, LOGGER_DEBUG);
return $f;
}