strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Allow multicolunn primary keys in dbstructure

Browse source
This commit is contained in:
Fabrixxm 2015-12-03 16:39:20 +01:00
parent 1f9644bded
commit 95508bf4bb
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/dbstructure.php
View file

@ -148,8 +148,9 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
$sql3=""; $sql3="";
if (!isset($database[$name])) { if (!isset($database[$name])) {
$r = db_create_table($name, $structure["fields"], $verbose, $action); $r = db_create_table($name, $structure["fields"], $verbose, $action);
if(false === $r) if(false === $r) {
$errors .= t('Errors encountered creating database tables.').$name.EOL; $errors .= t('Errors encountered creating database tables.').$name.EOL;
}
} else { } else {
// Drop the index if it isn't present in the definition and index name doesn't start with "local_" // Drop the index if it isn't present in the definition and index name doesn't start with "local_"
foreach ($database[$name]["indexes"] AS $indexname => $fieldnames) foreach ($database[$name]["indexes"] AS $indexname => $fieldnames)
@ -231,8 +232,8 @@ function db_field_command($parameters, $create = true) {
if ($parameters["extra"] != "") if ($parameters["extra"] != "")
$fieldstruct .= " ".$parameters["extra"]; $fieldstruct .= " ".$parameters["extra"];
if (($parameters["primary"] != "") AND $create) /*if (($parameters["primary"] != "") AND $create)
$fieldstruct .= " PRIMARY KEY"; $fieldstruct .= " PRIMARY KEY";*/
return($fieldstruct); return($fieldstruct);
} }
@ -243,9 +244,14 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
$r = true; $r = true;
$sql = ""; $sql = "";
$sql_rows = array(); $sql_rows = array();
$primary_keys = array();
foreach($fields AS $fieldname => $field) { foreach($fields AS $fieldname => $field) {
$sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field); $sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field);
if (x($field,'primary') and $field['primary']!=''){
$primary_keys[] = $fieldname;
}
} }
if (!is_null($indexes)) { if (!is_null($indexes)) {
@ -256,10 +262,13 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
} }
} }
if (count($primary_keys)>0) {
$sql_rows[] = sprintf("PRIMARY KEY(`%s`)", implode("`,`", $primary_keys));
}
$sql = implode(",\n\t", $sql_rows); $sql = implode(",\n\t", $sql_rows);
$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=utf8"; $sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", dbesc($name)).$sql."\n) DEFAULT CHARSET=utf8";
if ($verbose) if ($verbose)
echo $sql.";\n"; echo $sql.";\n";