git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit f5019ac5 authored by Brion Vibber's avatar Brion Vibber

tweaks for the installer whee

parent 283d56be
......@@ -230,6 +230,7 @@ $schema['notice_source'] = array(
'name' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'name of the source'),
'url' => array('type' => 'varchar', 'length' => 255, 'not null' => true, 'description' => 'url to link to'),
'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'date this record was created'),
'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
),
'primary key' => array('code'),
......
......@@ -341,6 +341,7 @@ abstract class Installer
}
$schema->ensureTable($name, $def);
}
return true;
}
/**
......@@ -441,11 +442,12 @@ abstract class Installer
if (!mb_strlen($stmt)) {
continue;
}
$res = $conn->execute($stmt);
if (DB::isError($res)) {
$error = $result->getMessage();
try {
$res = $conn->simpleQuery($stmt);
} catch (Exception $e) {
$error = $e->getMessage();
$this->updateStatus("ERROR ($error) for SQL '$stmt'");
return $res;
return false;
}
}
return true;
......@@ -458,9 +460,6 @@ abstract class Installer
*/
function registerInitialUser()
{
define('STATUSNET', true);
define('LACONICA', true); // compatibility
require_once INSTALLDIR . '/lib/common.php';
$data = array('nickname' => $this->adminNick,
......
......@@ -387,7 +387,14 @@ class MysqlSchema extends Schema
$vals = array_map(array($this, 'quote'), $column['enum']);
return 'enum(' . implode(',', $vals) . ')';
} else if ($this->_isString($column)) {
return parent::typeAndSize($column) . ' CHARSET utf8';
$col = parent::typeAndSize($column);
if (!empty($column['charset'])) {
$col .= ' CHARSET ' . $column['charset'];
}
if (!empty($column['collate'])) {
$col .= ' COLLATE ' . $column['collate'];
}
return $col;
} else {
return parent::typeAndSize($column);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment