mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-20 03:36:20 +02:00
possible fix for issue in #112 - PostgreSQL does not like backticks (only do them for MySQL)
This commit is contained in:
parent
977f335a0f
commit
a320b67508
@ -1420,15 +1420,26 @@ function db_quota_percent($count, $quota, $fieldname) {
|
|||||||
END AS $fieldname";
|
END AS $fieldname";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return boolean true if it's a MySQL database variant.
|
||||||
|
*/
|
||||||
|
function db_mysql() {
|
||||||
|
$type = Config::Read('database_type');
|
||||||
|
|
||||||
|
if($type == 'mysql' || $type == 'mysqli') {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns true if PostgreSQL is used, false otherwise
|
* returns true if PostgreSQL is used, false otherwise
|
||||||
*/
|
*/
|
||||||
function db_pgsql() {
|
function db_pgsql() {
|
||||||
if(Config::Read('database_type')=='pgsql') {
|
if(Config::Read('database_type')=='pgsql') {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1789,22 +1800,35 @@ function db_where_clause($condition, $struct, $additional_raw_where = '', $searc
|
|||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
/**
|
||||||
// table_by_key
|
* Convert a programmatic db table name into what may be the actual name.
|
||||||
// Action: Return table name for given key
|
*
|
||||||
// Call: table_by_key (string table_key)
|
* Takes into consideration any CONF database_prefix or database_tables map
|
||||||
//
|
*
|
||||||
|
* If it's a MySQL database, then we return the name with backticks around it (`).
|
||||||
|
*
|
||||||
|
* @param string database table name.
|
||||||
|
* @return string - database table name with appropriate prefix
|
||||||
|
*/
|
||||||
function table_by_key ($table_key) {
|
function table_by_key ($table_key) {
|
||||||
global $CONF;
|
global $CONF;
|
||||||
if (empty($CONF['database_tables'][$table_key])) {
|
|
||||||
$table = $table_key;
|
$table = $table_key;
|
||||||
} else {
|
|
||||||
|
if (!empty($CONF['database_tables'][$table_key])) {
|
||||||
$table = $CONF['database_tables'][$table_key];
|
$table = $CONF['database_tables'][$table_key];
|
||||||
}
|
}
|
||||||
|
|
||||||
return "`".$CONF['database_prefix'].$table."`";
|
$table = $CONF['database_prefix'] . $table;
|
||||||
|
|
||||||
|
if(db_mysql()) {
|
||||||
|
return "`" . $table . "`";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return $table;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* check if the database layout is up to date
|
* check if the database layout is up to date
|
||||||
* returns the current 'version' value from the config table
|
* returns the current 'version' value from the config table
|
||||||
|
Loading…
Reference in New Issue
Block a user