fix generated column check in information_schema extra field

pingcap · Jun 12, 2019 · 55210e6 · 55210e6
1 parent 25518f4
commit 55210e6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mydumper.c b/mydumper.c
@@ -1796,7 +1796,7 @@ MYSQL_STMT *execute_detect_fields_stmt(MYSQL *conn, char *database, char *table,
 }
 
 gboolean detect_generated_fields(MYSQL *conn, char *database, char *table){
-	const char* query = "select 1 from information_schema.COLUMNS where TABLE_SCHEMA=? and TABLE_NAME=? and extra like '%GENERATED%'";
+	const char* query = "select 1 from information_schema.COLUMNS where TABLE_SCHEMA=? and TABLE_NAME=? and (extra like '%STORED GENERATED%' or extra like '%VIRTUAL GENERATED%')";
 	MYSQL_STMT *stmt = execute_detect_fields_stmt(conn, database, table, query);
 	if (!stmt) {
 		return FALSE;
@@ -1848,7 +1848,7 @@ gboolean detect_tidb_rowid(MYSQL *conn, char *database, char *table) {
 }
 
 GString * get_insertable_fields(MYSQL *conn, char *database, char *table){
-	const char* query = "select COLUMN_NAME from information_schema.COLUMNS where TABLE_SCHEMA=? and TABLE_NAME=? and extra not like '%GENERATED%'";
+	const char* query = "select COLUMN_NAME from information_schema.COLUMNS where TABLE_SCHEMA=? and TABLE_NAME=? and extra not like '%STORED GENERATED%' and extra not like '%VIRTUAL GENERATED%'";
 	MYSQL_STMT *stmt = execute_detect_fields_stmt(conn, database, table, query);
 	if (!stmt) {
 		return NULL;