harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some poller optimisations and a fix for undefined (empty) dbtype which shows up as a mysql error that 'rand' isn't found.

Browse Source
This commit is contained in:
friendica
2014-11-16 15:51:42 -08:00
parent 7e58bfe931
commit 1c249a5b06
5 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/dba/dba_driver.php
View File

@@ -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;
}