GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

some more tweaking to do the mappings during filterDef; not totally sure I like it

Browse Source
This commit is contained in:
Brion Vibber
2010-10-15 16:32:37 -07:00
parent fa50ab2a94
commit eb93bdbb03
5 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/schema.php
View File

@@ -485,7 +485,7 @@ class Schema
return $this->buildCreateTable($tableName, $def);
}
$old = $this->filterDef($old);
//$old = $this->filterDef($old);
$def = $this->filterDef($def);
// @fixme check if not present
@@ -749,15 +749,17 @@ class Schema
function typeAndSize($column)
{
$type = $this->mapType($column);
//$type = $this->mapType($column);
$type = $column['type'];
if (isset($column['size'])) {
$type = $column['size'] . $type;
}
$lengths = array();
if ($column['type'] == 'numeric') {
if (isset($column['precision'])) {
$lengths[] = $column['precision'];
if (isset($column['scale'])) {
$lengths[] = $column['scale'];
}
if (isset($column['precision'])) {
$lengths[] = $column['precision'];
if (isset($column['scale'])) {
$lengths[] = $column['scale'];
}
} else if (isset($column['length'])) {
$lengths[] = $column['length'];
@@ -778,6 +780,12 @@ class Schema
*/
protected function reverseMapType($type)
{
$sizes = array('tiny', 'small', 'medium', 'big');
foreach ($sizes as $prefix) {
if (substr($type, 0, strlen($prefix)) == $prefix) {
return array(substr($type, strlen($prefix)), $prefix);
}
}
return array($type, null);
}