Skip to content
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

improve DDL support on CREATE DATABASE #4

Closed
wants to merge 1 commit into from
Closed

improve DDL support on CREATE DATABASE #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
211 changes: 94 additions & 117 deletions examples/browser/demo.browserified.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6194,8 +6194,8 @@ module.exports = (function(){
return cachedResult.result;
}

var result0, result1, result2, result3, result4, result5, result6;
var pos0, pos1;
var result0, result1, result2, result3, result4, result5, result6, result7, result8, result9;
var pos0, pos1, pos2;

reportFailures++;
pos0 = pos;
Expand Down Expand Up @@ -6235,13 +6235,95 @@ module.exports = (function(){
if (result2 !== null) {
result3 = parse___();
if (result3 !== null) {
result4 = parse_ID();
pos2 = pos;
if (input.substr(pos, 2).toLowerCase() === "if") {
result4 = input.substr(pos, 2);
pos += 2;
} else {
result4 = null;
if (reportFailures === 0) {
matchFailed("\"IF\"");
}
}
if (result4 !== null) {
result5 = parse__();
if (result5 !== null) {
result6 = parse_SCHEMA_PROPERTIES();
if (input.substr(pos, 3).toLowerCase() === "not") {
result6 = input.substr(pos, 3);
pos += 3;
} else {
result6 = null;
if (reportFailures === 0) {
matchFailed("\"NOT\"");
}
}
if (result6 !== null) {
result0 = [result0, result1, result2, result3, result4, result5, result6];
result7 = parse__();
if (result7 !== null) {
if (input.substr(pos, 5).toLowerCase() === "exist") {
result8 = input.substr(pos, 5);
pos += 5;
} else {
result8 = null;
if (reportFailures === 0) {
matchFailed("\"EXIST\"");
}
}
if (result8 !== null) {
if (input.substr(pos, 1).toLowerCase() === "s") {
result9 = input.substr(pos, 1);
pos++;
} else {
result9 = null;
if (reportFailures === 0) {
matchFailed("\"S\"");
}
}
if (result9 !== null) {
result4 = [result4, result5, result6, result7, result8, result9];
} else {
result4 = null;
pos = pos2;
}
} else {
result4 = null;
pos = pos2;
}
} else {
result4 = null;
pos = pos2;
}
} else {
result4 = null;
pos = pos2;
}
} else {
result4 = null;
pos = pos2;
}
} else {
result4 = null;
pos = pos2;
}
result4 = result4 !== null ? result4 : "";
if (result4 !== null) {
result5 = parse___();
if (result5 !== null) {
result6 = parse_ID();
if (result6 !== null) {
result7 = parse__();
if (result7 !== null) {
result8 = parse_SCHEMA_PROPERTIES();
if (result8 !== null) {
result0 = [result0, result1, result2, result3, result4, result5, result6, result7, result8];
} else {
result0 = null;
pos = pos1;
}
} else {
result0 = null;
pos = pos1;
}
} else {
result0 = null;
pos = pos1;
Expand Down Expand Up @@ -6271,12 +6353,13 @@ module.exports = (function(){
pos = pos1;
}
if (result0 !== null) {
result0 = (function(offset, what, name, props) {
result0 = (function(offset, what, exists, name, props) {
props.statement = 'CREATE';
props.what = what.toUpperCase();
props.database = name;
if (exists.length > 0) props.ifNotExist = true;
return props;
})(pos0, result0[2], result0[4], result0[6]);
})(pos0, result0[2], result0[4], result0[6], result0[8]);
}
if (result0 === null) {
pos = pos0;
Expand Down Expand Up @@ -6680,108 +6763,13 @@ module.exports = (function(){
}
if (result0 === null) {
pos0 = pos;
pos1 = pos;
if (input.substr(pos, 2).toLowerCase() === "if") {
result0 = input.substr(pos, 2);
pos += 2;
} else {
result0 = null;
if (reportFailures === 0) {
matchFailed("\"IF\"");
}
}
if (result0 !== null) {
result1 = parse__();
if (result1 !== null) {
if (input.substr(pos, 3).toLowerCase() === "not") {
result2 = input.substr(pos, 3);
pos += 3;
} else {
result2 = null;
if (reportFailures === 0) {
matchFailed("\"NOT\"");
}
}
if (result2 !== null) {
result3 = parse__();
if (result3 !== null) {
if (input.substr(pos, 5).toLowerCase() === "exist") {
result4 = input.substr(pos, 5);
pos += 5;
} else {
result4 = null;
if (reportFailures === 0) {
matchFailed("\"EXIST\"");
}
}
if (result4 !== null) {
if (input.substr(pos, 1).toLowerCase() === "s") {
result5 = input.substr(pos, 1);
pos++;
} else {
result5 = null;
if (reportFailures === 0) {
matchFailed("\"S\"");
}
}
result5 = result5 !== null ? result5 : "";
if (result5 !== null) {
result6 = parse__();
if (result6 !== null) {
result7 = parse_SCHEMA_PROPERTIES();
if (result7 !== null) {
result0 = [result0, result1, result2, result3, result4, result5, result6, result7];
} else {
result0 = null;
pos = pos1;
}
} else {
result0 = null;
pos = pos1;
}
} else {
result0 = null;
pos = pos1;
}
} else {
result0 = null;
pos = pos1;
}
} else {
result0 = null;
pos = pos1;
}
} else {
result0 = null;
pos = pos1;
}
} else {
result0 = null;
pos = pos1;
}
} else {
result0 = null;
pos = pos1;
}
result0 = parse__();
if (result0 !== null) {
result0 = (function(offset, props) {
props.ifNotExists = true;
return props;
})(pos0, result0[7]);
result0 = (function(offset) { return {}; })(pos0);
}
if (result0 === null) {
pos = pos0;
}
if (result0 === null) {
pos0 = pos;
result0 = parse__();
if (result0 !== null) {
result0 = (function(offset) { return {}; })(pos0);
}
if (result0 === null) {
pos = pos0;
}
}
}
}
}
Expand Down Expand Up @@ -14006,7 +13994,7 @@ module.exports = (function(){
}
if (result0 !== null) {
result0 = (function(offset, name) {
return { statement: "USE", datatbase: name };
return { statement: "USE", database: name };
})(pos0, result0[3]);
}
if (result0 === null) {
Expand Down Expand Up @@ -15380,20 +15368,9 @@ var addProperty = function (color, func) {
exports[color] = function (str) {
return func.apply(str);
};

if (Object.defineProperty) {
Object.defineProperty(String.prototype, color, {
get : func,
configurable: true,
enumerable: false
});
} else {
String.prototype.__defineGetter__(color, func);
}
String.prototype.__defineGetter__(color, func);
};



function stylize(str, style) {

var styles;
Expand Down
7 changes: 2 additions & 5 deletions grammar/13-01-08-create-database.pegjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@


CREATE_DATABASE "CREATE DATABASE"
= "CREATE"i __ what:("SCHEMA"i/"DATABASE"i) __ name:ID _ props:SCHEMA_PROPERTIES {
= "CREATE"i __ what:("SCHEMA"i/"DATABASE"i) _ exists:("IF"i _ "NOT"i _ "EXIST"i "S"i)? _ name:ID _ props:SCHEMA_PROPERTIES {
props.statement = 'CREATE';
props.what = what.toUpperCase();
props.database = name;
if (exists.length > 0) props.ifNotExists = true;
return props;
}

Expand All @@ -31,9 +32,5 @@ SCHEMA_PROPERTIES "schema properties"
props.comment = comment;
return props;
}
/ "IF"i _ "NOT"i _ "EXIST"i "S"i? _ props:SCHEMA_PROPERTIES {
props.ifNotExists = true;
return props;
}
/ _ { return {}; }

2 changes: 1 addition & 1 deletion grammar/13-08-04-use.pegjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

USE_STATEMENT "USE"
= "USE"i __ ("DATABASE"i __)? name:ID {
return { statement: "USE", datatbase: name };
return { statement: "USE", database: name };
}
Loading