}
function print_structure($database) {
+ echo "-- ------------------------------------------\n";
+ echo "-- ".FRIENDICA_PLATFORM." ".FRIENDICA_VERSION." (".FRIENDICA_CODENAME,")\n";
+ echo "-- DB_UPDATE_VERSION ".DB_UPDATE_VERSION."\n";
+ echo "-- ------------------------------------------\n\n\n";
foreach ($database AS $name => $structure) {
- echo "\t".'$database["'.$name."\"] = array(\n";
+ echo "--\n";
+ echo "-- TABLE $name\n";
+ echo "--\n";
+ db_create_table($name, $structure['fields'], true, false, $structure["indexes"]);
- echo "\t\t\t".'"fields" => array('."\n";
- foreach ($structure["fields"] AS $fieldname => $parameters) {
- echo "\t\t\t\t\t".'"'.$fieldname.'" => array(';
-
- $data = "";
- foreach ($parameters AS $name => $value) {
- if ($data != "")
- $data .= ", ";
- $data .= '"'.$name.'" => "'.$value.'"';
- }
-
- echo $data."),\n";
- }
- echo "\t\t\t\t\t),\n";
- echo "\t\t\t".'"indexes" => array('."\n";
- foreach ($structure["indexes"] AS $indexname => $fieldnames) {
- echo "\t\t\t\t\t".'"'.$indexname.'" => array("'.implode($fieldnames, '","').'"'."),\n";
- }
- echo "\t\t\t\t\t)\n";
- echo "\t\t\t);\n";
+ echo "\n";
}
}
-function update_structure($verbose, $action) {
+function update_structure($verbose, $action, $tables=null, $definition=null) {
global $a, $db;
$errors = false;
// Get the current structure
$database = array();
- $tables = q("show tables");
+ if (is_null($tables))
+ $tables = q("show tables");
foreach ($tables AS $table) {
$table = current($table);
}
// Get the definition
- $definition = db_definition();
+ if (is_null($definition))
+ $definition = db_definition();
// Compare it
foreach ($definition AS $name => $structure) {
if(false === $r)
$errors .= t('Errors encountered creating database tables.').$name.EOL;
} else {
- // Drop the index if it isn't present in the definition
+ // 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)
- if (!isset($structure["indexes"][$indexname])) {
+ if (!isset($structure["indexes"][$indexname]) && substr($indexname, 0, 6) != 'local_') {
$sql2=db_drop_index($indexname);
if ($sql3 == "")
$sql3 = "ALTER TABLE `".$name."` ".$sql2;
if ($parameters["not null"])
$fieldstruct .= " NOT NULL";
- if (isset($parameters["default"]))
- $fieldstruct .= " DEFAULT '".$parameters["default"]."'";
-
+ if (isset($parameters["default"])){
+ if (strpos(strtolower($parameters["type"]),"int")!==false) {
+ $fieldstruct .= " DEFAULT ".$parameters["default"];
+ } else {
+ $fieldstruct .= " DEFAULT '".$parameters["default"]."'";
+ }
+ }
if ($parameters["extra"] != "")
$fieldstruct .= " ".$parameters["extra"];
return($fieldstruct);
}
-function db_create_table($name, $fields, $verbose, $action) {
+function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
global $a, $db;
$r = true;
$sql = "";
+ $sql_rows = array();
foreach($fields AS $fieldname => $field) {
- if ($sql != "")
- $sql .= ",\n";
+ $sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field);
+ }
- $sql .= "`".dbesc($fieldname)."` ".db_field_command($field);
+ if (!is_null($indexes)) {
+
+ foreach ($indexes AS $indexname => $fieldnames) {
+ $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)
echo $sql.";\n";
return($sql);
}
-function db_create_index($indexname, $fieldnames) {
+function db_create_index($indexname, $fieldnames, $method="ADD") {
if ($indexname == "PRIMARY")
return;
$names .= "`".dbesc($fieldname)."`";
}
- $sql = sprintf("ADD INDEX `%s` (%s)", dbesc($indexname), $names);
+ $method = strtoupper(trim($method));
+ if ($method!="" && $method!="ADD") {
+ throw new Exception("Invalid parameter 'method' in db_create_index(): '$method'");
+ killme();
+ }
+
+ $sql = sprintf("%s INDEX `%s` (%s)", $method, dbesc($indexname), $names);
return($sql);
}
"fields" => array(
"k" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
"v" => array("type" => "text", "not null" => "1"),
+ "expire_mode" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
),
"indexes" => array(
"hub-verify" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"last-update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"success_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+ "failure_update" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"name-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"uri-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"avatar-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"term-date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+ "last-item" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"priority" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
"blocked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
"readonly" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "nick" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"connect" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
"updated" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+ "last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+ "last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
"location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"about" => array("type" => "text", "not null" => "1"),
"keywords" => array("type" => "text", "not null" => "1"),
"gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
+ "community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"network" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"generation" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
+ "server_url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
),
"indexes" => array(
"PRIMARY" => array("id"),
"nurl" => array("nurl"),
+ "updated" => array("updated"),
)
);
$database["glink"] = array(
"uid_gid_contactid" => array("uid","gid","contact-id"),
)
);
+ $database["gserver"] = array(
+ "fields" => array(
+ "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
+ "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "version" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "site_name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "info" => array("type" => "text", "not null" => "1"),
+ "register_policy" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
+ "poco" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "noscrape" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
+ "platform" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+ "last_poco_query" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+ "last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+ "last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
+ ),
+ "indexes" => array(
+ "PRIMARY" => array("id"),
+ "nurl" => array("nurl"),
+ )
+ );
$database["guid"] = array(
"fields" => array(
"id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"guid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "plink" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "uri" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
),
"indexes" => array(
"PRIMARY" => array("id"),
"guid" => array("guid"),
+ "plink" => array("plink"),
+ "uri" => array("uri"),
)
);
$database["hook"] = array(
"msg" => array("type" => "mediumtext", "not null" => "1"),
"uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
+ "iid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"parent" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"verb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
"oid_otype_type_term" => array("oid","otype","type","term"),
"uid_term_tid" => array("uid","term","tid"),
"type_term" => array("type","term"),
- "uid_otype_type_term_created" => array("uid","otype","type","term","created"),
+ "uid_otype_type_term_global_created" => array("uid","otype","type","term","global","created"),
"otype_type_term_tid" => array("otype","type","term","tid"),
"guid" => array("guid"),
)
"username" => array("username"),
)
);
+ $database["workerqueue"] = array(
+ "fields" => array(
+ "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
+ "parameter" => array("type" => "text", "not null" => "1"),
+ "priority" => array("type" => "tinyint(3) unsigned", "not null" => "1", "default" => "0"),
+ "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+ "pid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
+ "executed" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
+ ),
+ "indexes" => array(
+ "PRIMARY" => array("id"),
+ "created" => array("created"),
+ )
+ );
return($database);
}
unset($db_host, $db_user, $db_pass, $db_data);
}
- update_structure(true, true);
+ if ($argc==2) {
+ switch ($argv[1]) {
+ case "update":
+ update_structure(true, true);
+ return;
+ case "dumpsql":
+ print_structure(db_definition());
+ return;
+ }
+ }
+
+
+ // print help
+ echo $argv[0]." <command>\n";
+ echo "\n";
+ echo "commands:\n";
+ echo "update update database schema\n";
+ echo "dumpsql dump database schema\n";
+ return;
+
+
+
+
}
if (array_search(__file__,get_included_files())===0){
projects / friendica.git / blobdiff