Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

version bump, visulization domain change. update-test add test case

  • Loading branch information...
commit 947f1f04f2d480727e8287304dcd97324a232eda 1 parent 883df29
hochang authored
View
6 modules/app/package.json
@@ -1,7 +1,7 @@
{
"author": "ql.io",
"name": "ql.io-app",
- "version": "0.8.5",
+ "version": "0.8.6",
"repository": {
"type": "git",
"url": "https://github.com/ql-io/ql.io"
@@ -15,8 +15,8 @@
},
"dependencies": {
"commander": "1.0.0",
- "ql.io-console": "0.8.4",
- "ql.io-compiler": "0.8.1",
+ "ql.io-console": "0.8.5",
+ "ql.io-compiler": "0.8.2",
"winston": "0.6.2",
"express": "2.5.11",
"underscore": "1.3.3",
View
9 modules/compiler/lib/compiler.js
@@ -55,6 +55,9 @@ function plan(compiled) {
var creates = {};
var maxid = 0;
function divescope(lines, scope) {
+ if (!lines){
+ return;
+ }
var i, line;
for (i = 0; i < lines.length; i++) {
line = lines[i];
@@ -82,7 +85,7 @@ function plan(compiled) {
//dependsOn are the lines in try clause
divescope(line.dependsOn, line);
_.each(line.catchClause, function(k, mycatch){
- divescope(mycatch, line);
+ divescope(mycatch.lines, line);
});
if(line.finallyClause) {
divescope(line.finallyClause, line);
@@ -127,9 +130,9 @@ function plan(compiled) {
}
else if (line.type === 'try') {
//dependsOn are the lines in try clause
- divescope(line.dependsOn);
+ divescope(line.dependsOn,line);
_.each(line.catchClause, function(mycatch, k){
- divescope(mycatch, line);
+ divescope(mycatch.lines, line);
});
if(line.finallyClause) {
divescope(line.finallyClause, line);
View
2  modules/compiler/package.json
@@ -1,7 +1,7 @@
{
"author": "ql.io",
"name": "ql.io-compiler",
- "version": "0.8.1",
+ "version": "0.8.2",
"repository": {
"type": "git",
"url": "https://github.com/ql-io/ql.io"
View
8 modules/compiler/test/update-test.js
@@ -21,6 +21,13 @@ var util = require('util');
module.exports = {
'update': function (test) {
+ var q = 'a = { "one" : 1 }; update tab with "{a}"';
+ var statement = compiler.compile(q);
+ test.ok(statement.rhs.type === 'update');
+ test.ok(statement.rhs.dependsOn.length === 1);
+ test.done();
+ },
+ 'update-then-return': function (test) {
var q = 'a = { "one" : 1 }; update tab with "{a}";select * from tab';
var statement = compiler.compile(q);
test.ok(statement.rhs.type === 'select');
@@ -29,7 +36,6 @@ module.exports = {
test.ok(statement.rhs.dependsOn[0].dependsOn.length === 1);
test.done();
},
-
'update-select': function (test) {
var q = 'a = select * from tab; update tab with "{a}"';
var statement = compiler.compile(q);
View
6 modules/console/package.json
@@ -1,7 +1,7 @@
{
"author": "ql.io",
"name": "ql.io-console",
- "version": "0.8.4",
+ "version": "0.8.5",
"repository": {
"type": "git",
"url": "https://github.com/ql-io/ql.io"
@@ -15,9 +15,9 @@
"express": "2.5.11",
"ejs": "0.8.0",
"underscore": "1.3.3",
- "ql.io-engine": "0.8.3",
+ "ql.io-engine": "0.8.4",
"ql.io-mutable-uri": "0.8.0",
- "ql.io-compiler": "0.8.1",
+ "ql.io-compiler": "0.8.2",
"winston": "0.6.2",
"browserify": "1.14.2",
"uglify-js": "1.3.3",
View
4 modules/engine/lib/engine/visualization.js
@@ -20,8 +20,8 @@ var http = require('http'),
eventTypes = require('./event-types'),
_ = require('underscore');
exports.getPic = function(compiled, emitter){
- var post_domain = 'ql-2';
- var post_port = 3026;
+ var post_domain = 'yuml.me';
+ var post_port = 80;
var post_path = '/diagram/scruffy/class/';
var diagramtxt = composeDiagram(compiled);
if(!diagramtxt){
View
4 modules/engine/package.json
@@ -1,7 +1,7 @@
{
"author": "ql.io",
"name": "ql.io-engine",
- "version": "0.8.3",
+ "version": "0.8.4",
"repository": {
"type": "git",
"url": "https://github.com/ql-io/ql.io"
@@ -14,7 +14,7 @@
"winston": "0.6.2",
"underscore": "1.3.3",
"xml2json": "https://github.com/ql-io/node-xml2json/tarball/master",
- "ql.io-compiler": "0.8.1",
+ "ql.io-compiler": "0.8.2",
"ql.io-mutable-uri": "0.8.0",
"ql.io-uri-template": "0.8.0",
"ql.io-str-template": "0.8.0",
Please sign in to comment.
Something went wrong with that request. Please try again.