dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a sqlite upgrade schema bug.

Browse Source
This commit is contained in:
Mark Crane
2013-01-29 02:15:12 +00:00
parent 43ffea900a
commit 0c1b89a716
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/lib_schema.php
+13 -2
View File
@@ -199,6 +199,7 @@ function db_create_table ($apps, $db_type, $table) {
} }
function db_insert_into ($apps, $db_type, $table) { function db_insert_into ($apps, $db_type, $table) {
global $db, $db_name;
foreach ($apps as $x => &$app) { foreach ($apps as $x => &$app) {
foreach ($app['db'] as $y => $row) { foreach ($app['db'] as $y => $row) {
if ($row['table'] == $table) { if ($row['table'] == $table) {
@@ -230,7 +231,17 @@ function db_insert_into ($apps, $db_type, $table) {
if ($field_count > 0 ) { $sql .= ","; } if ($field_count > 0 ) { $sql .= ","; }
if (is_array($field['name'])) { if (is_array($field['name'])) {
if ($field['exists'] == "false") { if ($field['exists'] == "false") {
$sql .= $field['name']['deprecated']; if (is_array($field['name']['deprecated'])) {
foreach ($field['name']['deprecated'] as $row) {
if (db_column_exists ($db, $db_type, $db_name, $table, $row)) {
$sql .= $row;
break;
}
}
}
else {
$sql .= $field['name']['deprecated'];
}
} }
else { else {
$sql .= $field['name']['text']; $sql .= $field['name']['text'];
@@ -242,7 +253,7 @@ function db_insert_into ($apps, $db_type, $table) {
$field_count++; $field_count++;
} }
} }
$sql .= " FROM tmp_".$row['table'].";\n\n"; $sql .= " FROM tmp_".$table.";\n\n";
return $sql; return $sql;
} }
} }