Merge branch 'QA_4_4'

This commit is contained in:
Marc Delisle 2015-03-17 16:02:54 -04:00
commit b84c08f4d4
2 changed files with 3 additions and 1 deletions

View File

@ -75,6 +75,7 @@ explanation
4.3.13.0 (not yet released)
- bug #4803 "Show hidden items" is sometimes hidden
- bug #4807 Breaks when sorting by multiple columns while using UNION
- bug #4798 Missing column when exporting in sql
4.3.12.0 (2015-03-14)
- bug #4746 Right-aligned columns have left-aligned header

View File

@ -1374,9 +1374,10 @@ class ExportSql extends ExportPlugin
// lets find first line with constraints
$first_occur = -1;
for ($i = 0; $i < $sql_count; $i++) {
$sql_line = current(explode(' COMMENT ', $sql_lines[$i], 2));
if (preg_match(
'@[\s]+(CONSTRAINT|KEY)@',
$sql_lines[$i]
$sql_line
) && $first_occur == -1) {
$first_occur = $i;
}