Permalink
Browse files

Fixed export of tables with VIRTUAL columns

Apparently the flag differs between MySQL and MariaDB versions, so let's
check both.

Fixes #13647

Signed-off-by: Michal Čihař <michal@cihar.com>
  • Loading branch information...
nijel committed Sep 5, 2017
1 parent 29bfb26 commit 75728ab854c96cb96670594638966ef12ea52f92
Showing with 2 additions and 1 deletion.
  1. +1 −0 ChangeLog
  2. +1 −1 libraries/Table.php
View
@@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog
- issue #13604 Fixed crash on invalid ordering data
- issue #13639 Fixed error when browsing non SELECT results
- issue #13533 Fixed saving column to display
- issue #13647 Fixed export of tables with VIRTUAL columns
4.7.4 (2017-08-23)
- issue #13415 Remove shadow from the logo
View
@@ -1558,7 +1558,7 @@ public function getNonGeneratedColumns($backquoted = true)
$value = Util::backquote($value);
}
if (strpos($column['Extra'], 'GENERATED') === false) {
if (strpos($column['Extra'], 'GENERATED') === false && strpos($column['Extra'], 'VIRTUAL') === false) {
array_push($ret, $value);
}
}

0 comments on commit 75728ab

Please sign in to comment.