stackrender
diff --git a/‎pegjs/mariadb.pegjs‎
Lines changed: 11 additions & 0 deletions b/‎pegjs/mariadb.pegjs‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎pegjs/mysql.pegjs‎
Lines changed: 11 additions & 0 deletions b/‎pegjs/mysql.pegjs‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎src/show.js‎
Lines changed: 3 additions & 0 deletions b/‎src/show.js‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎test/mysql-mariadb.spec.js‎
Lines changed: 7 additions & 0 deletions b/‎test/mysql-mariadb.spec.js‎
Lines changed: 7 additions & 0 deletions
@@ -1259,6 +1259,17 @@ show_stmt
       }
     }
   }
+  / KW_SHOW __ 'COLUMNS'i __ from:from_clause {
+    return {
+        tableList: Array.from(tableList),
+        columnList: columnListTableAlias(columnList),
+        ast: {
+          type: 'show',
+          keyword: 'columns',
+          from
+        }
+      };
+  }
   / KW_SHOW __ KW_CREATE __ k:(KW_VIEW / KW_TABLE) __ t:table_name {
     const suffix = k.toLowerCase()
     return {
 
@@ -1566,6 +1566,17 @@ show_stmt
       }
     }
   }
+  / KW_SHOW __ 'COLUMNS'i __ from:from_clause {
+    return {
+        tableList: Array.from(tableList),
+        columnList: columnListTableAlias(columnList),
+        ast: {
+          type: 'show',
+          keyword: 'columns',
+          from
+        }
+      };
+  }
   / KW_SHOW __ KW_CREATE __ k:(KW_VIEW / KW_TABLE) __ t:table_name {
     const suffix = k.toLowerCase()
     return {
 
@@ -41,6 +41,9 @@ function showToSQL(showExpr) {
     case 'COLLATION':
       str = showLikeAndWhereToSQL(showExpr)
       break
+    case 'COLUMNS':
+      str = commonOptionConnector('FROM', tablesToSQL, showExpr.from)
+      break
     case 'GRANTS':
       str = showGrantsForUser(showExpr)
       break
 
@@ -636,6 +636,13 @@ describe('mysql', () => {
           'CREATE TRIGGER `trigger1` BEFORE UPDATE ON `merge` FOR EACH ROW FOLLOWS `trigger2` SET `NEW`.`updated_at` = current_timestamp()'
         ]
       },
+      {
+        title: 'show columns from table',
+        sql: [
+          'SHOW COLUMNS FROM table_name',
+          'SHOW COLUMNS FROM `table_name`'
+        ]
+      },
     ]
     SQL_LIST.forEach(sqlInfo => {
       const { title, sql } = sqlInfo
Original file line number	Diff line number	Diff line change
`@@ -1259,6 +1259,17 @@ show_stmt`
`1259`	`1259`	`}`
`1260`	`1260`	`}`
`1261`	`1261`	`}`
	`1262`	`+ / KW_SHOW __ 'COLUMNS'i __ from:from_clause {`
	`1263`	`+ return {`
	`1264`	`+ tableList: Array.from(tableList),`
	`1265`	`+ columnList: columnListTableAlias(columnList),`
	`1266`	`+ ast: {`
	`1267`	`+ type: 'show',`
	`1268`	`+ keyword: 'columns',`
	`1269`	`+ from`
	`1270`	`+ }`
	`1271`	`+ };`
	`1272`	`+ }`
`1262`	`1273`	`/ KW_SHOW __ KW_CREATE __ k:(KW_VIEW / KW_TABLE) __ t:table_name {`
`1263`	`1274`	`const suffix = k.toLowerCase()`
`1264`	`1275`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -1566,6 +1566,17 @@ show_stmt`
`1566`	`1566`	`}`
`1567`	`1567`	`}`
`1568`	`1568`	`}`
	`1569`	`+ / KW_SHOW __ 'COLUMNS'i __ from:from_clause {`
	`1570`	`+ return {`
	`1571`	`+ tableList: Array.from(tableList),`
	`1572`	`+ columnList: columnListTableAlias(columnList),`
	`1573`	`+ ast: {`
	`1574`	`+ type: 'show',`
	`1575`	`+ keyword: 'columns',`
	`1576`	`+ from`
	`1577`	`+ }`
	`1578`	`+ };`
	`1579`	`+ }`
`1569`	`1580`	`/ KW_SHOW __ KW_CREATE __ k:(KW_VIEW / KW_TABLE) __ t:table_name {`
`1570`	`1581`	`const suffix = k.toLowerCase()`
`1571`	`1582`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -636,6 +636,13 @@ describe('mysql', () => {`
`636`	`636`	'CREATE TRIGGER `trigger1` BEFORE UPDATE ON `merge` FOR EACH ROW FOLLOWS `trigger2` SET `NEW`.`updated_at` = current_timestamp()'
`637`	`637`	`]`
`638`	`638`	`},`
	`639`	`+ {`
	`640`	`+ title: 'show columns from table',`
	`641`	`+ sql: [`
	`642`	`+ 'SHOW COLUMNS FROM table_name',`
	`643`	+ 'SHOW COLUMNS FROM `table_name`'
	`644`	`+ ]`
	`645`	`+ },`
`639`	`646`	`]`
`640`	`647`	`SQL_LIST.forEach(sqlInfo => {`
`641`	`648`	`const { title, sql } = sqlInfo`