Merge pull request taozhi8833998#400 from taozhi8833998/bug-multiple-prepared-statements

taozhi8833998 · web-flow · commit 30fa0cd1ada4 · 2020-07-24T10:54:10.000+08:00
fix multipler prepared statements bug
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-sql-parser",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "simple node sql parser",
   "main": "index.js",
   "types": "index.d.ts",
diff --git a/pegjs/mysql.pegjs b/pegjs/mysql.pegjs
@@ -1583,7 +1583,7 @@ primary
         return list;
     }
   / var_decl
-  / __ prepared_symbol:'?' __ {
+  / __ prepared_symbol:'?' {
     return {
       type: 'origin',
       value: prepared_symbol
diff --git a/test/select.spec.js b/test/select.spec.js
@@ -1244,12 +1244,16 @@ describe('select', () => {
     it('should parse mysql prepared statements', () => {
       expect(getParsedSql('SELECT bar, baz, foo FROM tablename WHERE bar = ?'))
       .to.be.equal('SELECT `bar`, `baz`, `foo` FROM `tablename` WHERE `bar` = ?')
+      expect(getParsedSql('SELECT bar, baz, foo FROM tablename WHERE bar = ? and baz = ?'))
+      .to.be.equal('SELECT `bar`, `baz`, `foo` FROM `tablename` WHERE `bar` = ? AND `baz` = ?')
     })
 
     it('should parse pg prepared statements', () => {
       const opt = { database: 'postgresql' }
       expect(getParsedSql('SELECT bar, baz, foo FROM tablename WHERE bar = $1', opt))
       .to.be.equal('SELECT "bar", "baz", "foo" FROM "tablename" WHERE "bar" = $1', opt)
+      expect(getParsedSql('SELECT bar, baz, foo FROM tablename WHERE bar = $1 and baz = $2', opt))
+      .to.be.equal('SELECT "bar", "baz", "foo" FROM "tablename" WHERE "bar" = $1 AND "baz" = $2', opt)
     })
   })
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "node-sql-parser",`
`3`		`- "version": "3.0.2",`
	`3`	`+ "version": "3.0.3",`
`4`	`4`	`"description": "simple node sql parser",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"types": "index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -1583,7 +1583,7 @@ primary`
`1583`	`1583`	`return list;`
`1584`	`1584`	`}`
`1585`	`1585`	`/ var_decl`
`1586`		`- / __ prepared_symbol:'?' __ {`
	`1586`	`+ / __ prepared_symbol:'?' {`
`1587`	`1587`	`return {`
`1588`	`1588`	`type: 'origin',`
`1589`	`1589`	`value: prepared_symbol`