Merge pull request #2 from rodrigogs/order_columns_ordinal_position

Order columns by ordinal position

.eslintrc

@@ -1,6 +1,7 @@
 {
   "env": {
-    "node": true
+    "node": true,
+    "es6": true
   },
   "extends": "eslint:recommended",
   "rules": {

.npmignore

@@ -9,3 +9,5 @@ npm-install-stamp
 
 *.sublime-project
 *.sublime-workspace
+.idea
+*.iml

docker-compose.yml

@@ -32,7 +32,7 @@ services:
       MYSQL_ROOT_PASSWORD: root
   mysql80:
       image: mysql:8.0
-      command: [ "--server-id=1", "--log-bin=/var/lib/mysql/mysql-bin.log", "--binlog-format=row"]
+      command: [ "--server-id=1", "--log-bin=/var/lib/mysql/mysql-bin.log", "--binlog-format=row", "--default-authentication-plugin=mysql_native_password"]
       networks:
         default:
           aliases:

docker-test.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 MYSQL_HOSTS="mysql55 mysql56 mysql57 mysql80"
 
+docker-compose up -d
+
 for hostname in ${MYSQL_HOSTS}; do
   echo $hostname
   docker run -it --network=zongji_default -e MYSQL_HOST=$hostname -w /build -v $PWD:/build node:8 npm test

index.js

@@ -184,10 +184,16 @@ ZongJi.prototype._executeCtrlCallbacks = function() {
   }
 };
 
-var tableInfoQueryTemplate = 'SELECT ' +
-  'COLUMN_NAME, COLLATION_NAME, CHARACTER_SET_NAME, ' +
-  'COLUMN_COMMENT, COLUMN_TYPE ' +
-  'FROM information_schema.columns ' + "WHERE table_schema='%s' AND table_name='%s'";
+var tableInfoQueryTemplate = `
+SELECT
+  COLUMN_NAME, COLLATION_NAME, CHARACTER_SET_NAME,
+  COLUMN_COMMENT, COLUMN_TYPE
+FROM
+  information_schema.columns
+WHERE
+  table_schema='%s' AND table_name='%s'
+ORDER BY ORDINAL_POSITION;
+`;
 
 ZongJi.prototype._fetchTableInfo = function(tableMapEvent, next) {
   var self = this;