clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix SQL generation, update database.sql

This commit is contained in:
fabrixxm 2015-03-25 10:03:17 +01:00
parent b2b1de5a01
commit 7c33c9cca1
2 changed files with 299 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

603
database.sql
View File

File diff suppressed because it is too large Load Diff

22
include/dbstructure.php
View File

@ -219,9 +219,13 @@ function db_field_command($parameters, $create = true) {
if ($parameters["not null"]) if ($parameters["not null"])
$fieldstruct .= " NOT NULL"; $fieldstruct .= " NOT NULL";
if (isset($parameters["default"])) if (isset($parameters["default"])){
if (strpos(strtolower($parameters["type"]),"int")!==false) {
$fieldstruct .= " DEFAULT ".$parameters["default"];
} else {
$fieldstruct .= " DEFAULT '".$parameters["default"]."'"; $fieldstruct .= " DEFAULT '".$parameters["default"]."'";
}
}
if ($parameters["extra"] != "") if ($parameters["extra"] != "")
$fieldstruct .= " ".$parameters["extra"]; $fieldstruct .= " ".$parameters["extra"];
@ -237,20 +241,22 @@ function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
$r = true; $r = true;
$sql = ""; $sql = "";
$sql_rows = array();
foreach($fields AS $fieldname => $field) { foreach($fields AS $fieldname => $field) {
if ($sql != "") $sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field);
$sql .= ",\n";
$sql .= "\t`".dbesc($fieldname)."` ".db_field_command($field);
} }
if (!is_null($indexes)) { if (!is_null($indexes)) {
foreach ($indexes AS $indexname => $fieldnames) { foreach ($indexes AS $indexname => $fieldnames) {
$sql .= "\t".db_create_index($indexname, $fieldnames, "")."\n"; $sql_index = db_create_index($indexname, $fieldnames, "");
if (!is_null($sql_index)) $sql_rows[] = $sql_index;
} }
} }
$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n", dbesc($name)).$sql."\n) DEFAULT CHARSET=utf8"; $sql = implode(",\n\t", $sql_rows);
$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";