Merge pull request #1 from justinkenel/master

sync fork to original repo

Author: tsart

.github/workflows/nodejs.yml

@@ -0,0 +1,26 @@
+name: Node CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [8.x, 10.x, 12.x]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: npm install, build, and test
+      run: |
+        npm ci
+        npm run build --if-present
+        npm test
+      env:
+        CI: true

npmpublish.yml

@@ -0,0 +1,45 @@
+name: Node.js Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm ci
+      - run: npm test
+
+  publish-npm:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
+
+  publish-gpr:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://npm.pkg.github.com/
+          scope: '@your-github-username'
+      - run: npm ci
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

package-lock.json

@@ -8,7 +8,10 @@
     "nearley": "^2.9.0"
   },
   "devDependencies": {
-    "mocha": "^3.3.0"
+    "mocha": "^3.3.0",
+    "diff": ">=3.5.0",
+    "debug": ">=2.6.9",
+    "growl": ">=1.10.0"
   },
   "scripts": {
     "compile": "nearleyc ./sql.ne -o sql-parse.js",

package.json

@@ -149,6 +149,7 @@ identifier_comma_list ->
 table ->
     identifier {% d => ({type: 'table', table: d[0].value}) %}
   | identifier "." identifier {% d => ({type: 'table', table: d[0].value +'.'+ d[2].value }) %}
+  | identifier "." identifier ( __ AS __ | __ ) identifier {% d => ({type: 'table', table: d[0].value +'.'+ d[2].value, alias: d[4].value }) %}
   | identifier ( __ AS __ | __) identifier {% d => ({type: 'table', table: d[0].value, alias: d[2].value}) %}
 
 where_clause ->

sql.ne

@@ -311,7 +311,29 @@ const tests = [
 				}]
 			}]
 		}
-	}
+  },
+  {
+    sql: `select a.x, b.y from s.c a left join s.d as b on a.x=b.x`,
+    toSql: '(select `a`.`x`, `b`.`y` from ((`s.c`as `a` left join `s.d`as `b` on (`a`.`x` = `b`.`x`))))',
+    expected: {
+      sourceTables: ['s.c', 's.d'],
+      aliases: {
+        a: 's.c',
+        b: 's.d'
+      }
+    }
+  },
+  {
+    sql: `select a.x, b.y from [s].[c a] a left join s.[d] as b on a.x=b.x`,
+    toSql: '(select `a`.`x`, `b`.`y` from ((`s.c a`as `a` left join `s.d`as `b` on (`a`.`x` = `b`.`x`))))',
+    expected: {
+      sourceTables: ['s.c a', 's.d'],
+      aliases: {
+        a: 's.c a',
+        b: 's.d'
+      }
+    }
+  }
 ];
 
 const parser = require('../parser')();
@@ -338,4 +360,4 @@ describe('parse', function() {
       }
     });
   })
-});
+});