Skip to content

add between and not between in where #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rrequero wants to merge 3 commits into
base: v2
Choose a base branch
from
Open

add between and not between in where #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df42921
add between and not between in where
rrequero Jul 12, 2016
0510758
add support to cast
rrequero Aug 8, 2016
2a195b8
add support to - in table name
rrequero Jan 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Launch",
"type": "node",
"request": "launch",
"program": "${workspaceRoot}/index.js",
"stopOnEntry": false,
"args": [],
"cwd": "${workspaceRoot}",
"preLaunchTask": null,
"runtimeExecutable": null,
"runtimeArgs": [
"--nolazy"
],
"env": {
"NODE_ENV": "development"
},
"externalConsole": false,
"sourceMaps": false,
"outDir": null
},
{
"name": "Attach",
"type": "node",
"request": "attach",
"port": 5858,
"address": "localhost",
"restart": false,
"sourceMaps": false,
"outDir": null,
"localRoot": "${workspaceRoot}",
"remoteRoot": null
},
{
"name": "Attach to Process",
"type": "node",
"request": "attach",
"processId": "${command.PickProcess}",
"port": 5858,
"sourceMaps": false,
"outDir": null
}
]
}
41 changes: 18 additions & 23 deletions dist/simpleSqlParser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,15 +445,8 @@ exports.version = require('./package.json').version;
module.exports={
"_args": [
[
{
"name": "parsimmon",
"raw": "parsimmon@0.7.0",
"rawSpec": "0.7.0",
"scope": null,
"spec": "0.7.0",
"type": "version"
},
"D:\\Users\\David\\Documents\\EscaleDigitale\\simpleSqlParser"
"parsimmon@0.7.0",
"/Users/ra/Workspace/ra/simpleSqlParser"
]
],
"_from": "parsimmon@0.7.0",
Expand Down Expand Up @@ -482,7 +475,7 @@ module.exports={
"_shasum": "652fc7cbade73c5edb42a266ec556c906d82c9fb",
"_shrinkwrap": null,
"_spec": "parsimmon@0.7.0",
"_where": "D:\\Users\\David\\Documents\\EscaleDigitale\\simpleSqlParser",
"_where": "/Users/ra/Workspace/ra/simpleSqlParser",
"author": {
"email": "jneen at jneen dot net",
"name": "Jeanine Adkisson"
Expand All @@ -505,30 +498,30 @@ module.exports={
"tarball": "https://registry.npmjs.org/parsimmon/-/parsimmon-0.7.0.tgz"
},
"files": [
"index.js",
"src",
"test",
"Makefile",
"package.json",
"build/parsimmon.commonjs.js",
"build/parsimmon.browser.js",
"build/parsimmon.browser.min.js"
"build/parsimmon.browser.min.js",
"build/parsimmon.commonjs.js",
"index.js",
"package.json",
"src",
"test"
],
"homepage": "https://github.com/jneen/parsimmon",
"keywords": [
"parsing",
"parse",
"parser combinators"
"parser combinators",
"parsing"
],
"main": "index.js",
"maintainers": [
{
"email": "jjmadkisson@gmail.com",
"name": "jayferd"
"name": "jayferd",
"email": "jjmadkisson@gmail.com"
},
{
"email": "jneen@jneen.net",
"name": "jneen"
"name": "jneen",
"email": "jneen@jneen.net"
}
],
"name": "parsimmon",
Expand Down Expand Up @@ -776,7 +769,7 @@ function getPos(parser) {

// The name of a column/table
var colName = alt(
regex(/(?!(FROM|WHERE|GROUP BY|ORDER BY|LIMIT|INNER|LEFT|RIGHT|JOIN|ON|VALUES|SET)\s)[a-z*][a-z0-9_]*/i),
regex(/(?!(FROM|WHERE|GROUP BY|ORDER BY|LIMIT|INNER|LEFT|RIGHT|JOIN|ON|VALUES|SET)\s)[a-z*][a-z0-9_:]*/i),
regex(/`[^`\\]*(?:\\.[^`\\]*)*`/)
);

Expand Down Expand Up @@ -835,6 +828,8 @@ var operator = alt(
regex(/IS/i),
regex(/LIKE/i),
regex(/NOT LIKE/i),
regex(/BETWEEN/i),
regex(/NOT BETWEEN/i),
string('%'),
regex(/MOD/i),
regex(/NOT/i),
Expand Down
2 changes: 1 addition & 1 deletion dist/simpleSqlParser.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion dist/simpleSqlParser.withoutDeps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ function getPos(parser) {

// The name of a column/table
var colName = alt(
regex(/(?!(FROM|WHERE|GROUP BY|ORDER BY|LIMIT|INNER|LEFT|RIGHT|JOIN|ON|VALUES|SET)\s)[a-z*][a-z0-9_]*/i),
regex(/(?!(FROM|WHERE|GROUP BY|ORDER BY|LIMIT|INNER|LEFT|RIGHT|JOIN|ON|VALUES|SET)\s)[a-z*][a-z0-9_:]*/i),
regex(/`[^`\\]*(?:\\.[^`\\]*)*`/)
);

Expand Down Expand Up @@ -296,6 +296,8 @@ var operator = alt(
regex(/IS/i),
regex(/LIKE/i),
regex(/NOT LIKE/i),
regex(/BETWEEN/i),
regex(/NOT BETWEEN/i),
string('%'),
regex(/MOD/i),
regex(/NOT/i),
Expand Down
2 changes: 1 addition & 1 deletion dist/simpleSqlParser.withoutDeps.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src/sql2ast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function getPos(parser) {

// The name of a column/table
var colName = alt(
regex(/(?!(FROM|WHERE|GROUP BY|ORDER BY|LIMIT|INNER|LEFT|RIGHT|JOIN|ON|VALUES|SET)\s)[a-z*][a-z0-9_]*/i),
regex(/(?!(FROM|WHERE|GROUP BY|ORDER BY|LIMIT|INNER|LEFT|RIGHT|JOIN|ON|VALUES|SET)\s)[a-z*][a-z0-9_:-]*/i),
regex(/`[^`\\]*(?:\\.[^`\\]*)*`/)
);

Expand Down Expand Up @@ -140,6 +140,8 @@ var operator = alt(
regex(/IS/i),
regex(/LIKE/i),
regex(/NOT LIKE/i),
regex(/BETWEEN/i),
regex(/NOT BETWEEN/i),
string('%'),
regex(/MOD/i),
regex(/NOT/i),
Expand Down
Loading