From 1fb040a1df77afd8059683b29fd09c6e17a8d6e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 22 Dec 2016 15:15:20 +0100
Subject: [PATCH] Fixed editing of virtual columns
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12847

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog           | 1 +
 libraries/Table.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 829b3ea0ce..15f0b1b5d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@ phpMyAdmin - ChangeLog
 - issue #12293 Correctly report OpenSSL errors from cookie encryption
 - issue #12814 DateTime won't allow to input length in Routine editor
 - issue #12841 Fixed moving of columns with whitespace in name
+- issue #12847 Fixed editing of virtual columns
 
 4.6.5.2 (2016-12-05)
 - issue #12765 Fixed SQL export with newlines
diff --git a/libraries/Table.php b/libraries/Table.php
index 0d9446d1c1..c4fca789a8 100644
--- a/libraries/Table.php
+++ b/libraries/Table.php
@@ -2465,7 +2465,7 @@ class Table
          * @var \SqlParser\Statements\CreateStatement $stmt
         */
         $stmt = $parser->statements[0];
-        $fields = Table::getFields($stmt);
+        $fields = \SqlParser\Utils\Table::getFields($stmt);
         if ($column != null) {
             $expression = isset($fields[$column]['expr']) ?
                 substr($fields[$column]['expr'], 1, -1) : '';