diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-04-22 03:52:07 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-04-22 03:52:07 +0000 |
| commit | c016f4593e67df2fc3410e765acf265c54e8bb2c (patch) | |
| tree | 1ad7ee88302b0ec1a53c29d713e4d1265febf308 /phpBB | |
| parent | 478ab68a7eb609de10fd6f9e874d7387f5842cb8 (diff) | |
| download | forums-c016f4593e67df2fc3410e765acf265c54e8bb2c.tar forums-c016f4593e67df2fc3410e765acf265c54e8bb2c.tar.gz forums-c016f4593e67df2fc3410e765acf265c54e8bb2c.tar.bz2 forums-c016f4593e67df2fc3410e765acf265c54e8bb2c.tar.xz forums-c016f4593e67df2fc3410e765acf265c54e8bb2c.zip | |
- extrapolation is uncool, lets get the _real_name instead of guessing
- fixed some bugs :P
git-svn-id: file:///svn/phpbb/trunk@5816 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 1572a80c89..6aaff53b2c 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -110,9 +110,9 @@ class acp_database if ($download == true) { $name = $filename . $ext; - header('Pragma: no-cache'); - header("Content-Type: $mimetype; name=\"$name\""); - header("Content-disposition: attachment; filename=$name"); + //header('Pragma: no-cache'); + //header("Content-Type: $mimetype; name=\"$name\""); + //header("Content-disposition: attachment; filename=$name"); } // All of the generated queries go here @@ -678,7 +678,7 @@ class acp_database { $info = ibase_field_info($result, $i); $ary_type[] = $info['type']; - $ary_name[] = "'" . $info['name'] . "'"; + $ary_name[] = $info['name']; } while ($row = $db->sql_fetchrow($result)) @@ -688,7 +688,7 @@ class acp_database // Build the SQL statement to recreate the data. for ($i = 0; $i < $i_num_fields; $i++) { - $str_val = $row[$ary_name[$i]]; + $str_val = $row[strtolower($ary_name[$i])]; if (preg_match('#char|text|bool#i', $ary_type[$i])) { @@ -719,7 +719,7 @@ class acp_database } $schema_vals[] = $str_quote . $str_val . $str_quote; - $schema_fields[] = $ary_name[$i]; + $schema_fields[] = "'" . $ary_name[$i] . "'"; } // Take the ordered fields and their associated data and build it @@ -761,7 +761,7 @@ class acp_database for ($i = 0; $i < $i_num_fields; $i++) { $ary_type[] = ocicolumntype($result, $i); - $ary_name[] = "'" . ocicolumnname($result, $i) . "'"; + $ary_name[] = ocicolumnname($result, $i); } while ($row = $db->sql_fetchrow($result)) @@ -802,7 +802,7 @@ class acp_database } $schema_vals[] = $str_quote . $str_val . $str_quote; - $schema_fields[] = $ary_name[$i]; + $schema_fields[] = '"' . $ary_name[$i] . "'"; } // Take the ordered fields and their associated data and build it @@ -1570,11 +1570,17 @@ class acp_database $result = $db->sql_query($sql); while ($row = $db->sql_fetchrow($result)) { - $sql_data .= "\nCREATE GENERATOR " . substr($row['dname'], 2) . ";;"; - $sql_data .= "\nSET GENERATOR " . substr($row['dname'], 2) . " TO 0;;\n"; + $sql = 'SELECT T1.RDB$DEPENDED_ON_NAME AS GEN, T1.RDB$FIELD_NAME, T1.RDB$DEPENDED_ON_TYPE FROM RDB$DEPENDENCIES T1 WHERE (T1.RDB$DEPENDENT_NAME = \'' . $row['dname'] . '\') AND (T1.RDB$DEPENDENT_TYPE = 2 AND T1.RDB$DEPENDED_ON_TYPE = 14) UNION ALL SELECT DISTINCT D.RDB$DEPENDED_ON_NAME, D.RDB$FIELD_NAME, D.RDB$DEPENDED_ON_TYPE FROM RDB$DEPENDENCIES D, RDB$RELATION_FIELDS F WHERE (D.RDB$DEPENDENT_TYPE = 3) AND (D.RDB$DEPENDENT_NAME = F.RDB$FIELD_SOURCE) AND (F.RDB$RELATION_NAME = \'' . $row['dname'] . '\') ORDER BY 1,2'; + $result2 = $db->sql_query($sql); + $row2 = $db->sql_fetchrow($result2); + $db->sql_freeresult($result2); + $gen_name = $row2['gen']; + + $sql_data .= "\nCREATE GENERATOR " . $gen_name . ";;"; + $sql_data .= "\nSET GENERATOR " . $gen_name . " TO 0;;\n"; $sql_data .= "\nCREATE TRIGGER {$row['dname']} FOR $table_name"; $sql_data .= "\nBEFORE INSERT\nAS\nBEGIN"; - $sql_data .= "\n NEW.{$row['fname']} = GEN_ID(" . substr($row['dname'], 2) . ", 1);"; + $sql_data .= "\n NEW.{$row['fname']} = GEN_ID(" . $gen_name . ", 1);"; $sql_data .= "\nEND;;\n"; } |