Skip to content

Commit

Permalink
Merge pull request #26 from SlicingDice/v2.0.3
Browse files Browse the repository at this point in the history 
Release of v2.0.3
  • Loading branch information
@joaosimbiose
joaosimbiose authored Sep 8, 2018
2 parents 298bcb7 + adbfab9 commit 9a13f42
Show file tree
Hide file tree
Showing 3 changed files with 89 additions and 48 deletions.
5 changes: 1 addition & 4 deletions src/slicer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
// RequesterBrowser make http requests from the browser
class RequesterBrowser {
run(token, url, reqType, data = null, sql) {
url = url.hostname + url.path;
let content_type;

if (sql) {
Expand All @@ -25,8 +24,6 @@
req.open(reqType, url, true);
req.setRequestHeader("Authorization", token);
req.setRequestHeader('Content-Type', content_type);
req.setRequestHeader('Access-Control-Allow-Origin', '*');
req.setRequestHeader('Access-Control-Allow-Credentials', true);
req.setRequestHeader('Accept', "application/json");
req.onload = function() {
if (req.status == 200) {
Expand All @@ -42,7 +39,7 @@
req.onerror = function() {
reject(Error("Network Error"));
};
req.send(JSON.stringify(data));
req.send(sql ? data : JSON.stringify(data));
});
}
}
Expand Down
60 changes: 40 additions & 20 deletions tests_and_examples/examples/delete.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,47 @@
"cardinality": "high",
"storage": "latest-value",
"name": "string_test_column",
"api-name": "string-test-column"
"api-name": "string-test-column",
"dimension": "delete-test"
},
{
"storage": "latest-value",
"type": "integer",
"name": "integer_test_column",
"api-name": "integer-test-column"
"api-name": "integer-test-column",
"dimension": "delete-test"
}
],
"insert": {
"Entity1": {
"string-test-column": "value:deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity2": {
"string-test-column": "value:deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity3": {
"string-test-column": "value:deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity4": {
"string-test-column": "value:deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity5": {
"string-test-column": "value:deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity6": {
"string-test-column": "value:deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
}
},
"additional_operation": {
Expand All @@ -50,7 +58,8 @@
"equals":"Entity3"
}
}
]
],
"dimension": "delete-test"
},
"result_additional": {
"status": "ignore",
Expand All @@ -67,7 +76,8 @@
"equals": "value:deleted_entity"
}
}
]
],
"dimension": "delete-test"
},
"expected": {
"status": "ignore",
Expand All @@ -86,39 +96,47 @@
"cardinality": "high",
"storage": "latest-value",
"name": "string_test_column",
"api-name": "string-test-column"
"api-name": "string-test-column",
"dimension": "delete-test"
},
{
"storage": "latest-value",
"type": "integer",
"name": "integer_test_column",
"api-name": "integer-test-column"
"api-name": "integer-test-column",
"dimension": "delete-test"
}
],
"insert": {
"Entity1": {
"string-test-column": "value:deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity2": {
"string-test-column": "value:deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity3": {
"string-test-column": "value:deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity4": {
"string-test-column": "value:not_deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity5": {
"string-test-column": "value:not_deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
},
"Entity6": {
"string-test-column": "value:not_deleted_entity",
"integer-test-column": 1000001
"integer-test-column": 1000001,
"dimension": "delete-test"
}
},
"additional_operation": {
Expand All @@ -128,7 +146,8 @@
"equals":"value:deleted_entity"
}
}
]
],
"dimension": "delete-test"
},
"result_additional": {
"status": "ignore",
Expand All @@ -145,7 +164,8 @@
"equals": "value:deleted_entity"
}
}
]
],
"dimension": "delete-test"
},
"expected": {
"status": "ignore",
Expand Down
72 changes: 48 additions & 24 deletions tests_and_examples/examples/update.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,63 +8,73 @@
"cardinality": "high",
"storage": "latest-value",
"name": "string_test_column",
"api-name": "string-test-column"
"api-name": "string-test-column",
"dimension": "delete-test"
},
{
"storage": "latest-value",
"type": "boolean",
"name": "boolean_test_column",
"api-name": "boolean-test-column"
"api-name": "boolean-test-column",
"dimension": "delete-test"
},
{
"storage": "latest-value",
"type": "integer",
"name": "integer_test_column",
"api-name": "integer-test-column"
"api-name": "integer-test-column",
"dimension": "delete-test"
},
{
"storage": "latest-value",
"type": "datetime",
"name": "datetime_test_column",
"api-name": "datetime-test-column"
"api-name": "datetime-test-column",
"dimension": "delete-test"
}
],
"insert": {
"Entity1": {
"string-test-column": "value:matched_value",
"boolean-test-column": "true",
"integer-test-column": 1000001,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity2": {
"string-test-column": "value:matched_value",
"boolean-test-column": "true",
"integer-test-column": 1000001,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity3": {
"string-test-column": "value:matched_value",
"boolean-test-column": "true",
"integer-test-column": 1000001,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity4": {
"string-test-column": "value:garbage_value",
"boolean-test-column": "true",
"integer-test-column": 1000001,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity5": {
"string-test-column": "value:garbage_value",
"boolean-test-column": "true",
"integer-test-column": 1000001,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity6": {
"string-test-column": "value:garbage_value",
"boolean-test-column": "true",
"integer-test-column": 1000001,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
}
},
"additional_operation": {
Expand All @@ -77,7 +87,8 @@
],
"set":{
"integer-test-column":2000002
}
},
"dimension": "delete-test"
},
"result_additional": {
"status": "ignore",
Expand All @@ -94,7 +105,8 @@
"equals": 2000002
}
}
]
],
"dimension": "delete-test"
},
"expected": {
"status": "ignore",
Expand All @@ -113,63 +125,73 @@
"cardinality": "high",
"storage": "latest-value",
"name": "string_test_column",
"api-name": "string-test-column"
"api-name": "string-test-column",
"dimension": "delete-test"
},
{
"storage": "latest-value",
"type": "boolean",
"name": "boolean_test_column",
"api-name": "boolean-test-column"
"api-name": "boolean-test-column",
"dimension": "delete-test"
},
{
"storage": "latest-value",
"type": "integer",
"name": "integer_test_column",
"api-name": "integer-test-column"
"api-name": "integer-test-column",
"dimension": "delete-test"
},
{
"storage": "latest-value",
"type": "datetime",
"name": "datetime_test_column",
"api-name": "datetime-test-column"
"api-name": "datetime-test-column",
"dimension": "delete-test"
}
],
"insert": {
"Entity1": {
"string-test-column": "value:matched_value",
"boolean-test-column": "true",
"integer-test-column": 1000001,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity2": {
"string-test-column": "value:matched_value",
"boolean-test-column": "true",
"integer-test-column": 1000001,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity3": {
"string-test-column": "value:matched_value",
"boolean-test-column": "true",
"integer-test-column": 1000001,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity4": {
"string-test-column": "value:garbage_value",
"boolean-test-column": "true",
"integer-test-column": 1000002,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity5": {
"string-test-column": "value:garbage_value",
"boolean-test-column": "true",
"integer-test-column": 1000002,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
},
"Entity6": {
"string-test-column": "value:garbage_value",
"boolean-test-column": "true",
"integer-test-column": 1000002,
"datetime-test-column": "2018-01-21T00:50:00Z"
"datetime-test-column": "2018-01-21T00:50:00Z",
"dimension": "delete-test"
}
},
"additional_operation": {
Expand All @@ -191,7 +213,8 @@
"boolean-test-column": "false",
"integer-test-column": 3000003,
"datetime-test-column": "2018-01-24T10:50:00Z"
}
},
"dimension": "delete-test"
},
"result_additional": {
"status": "ignore",
Expand Down Expand Up @@ -226,7 +249,8 @@
"equals": "2018-01-24T10:50:00Z"
}
}
]
],
"dimension": "delete-test"
},
"expected": {
"status": "ignore",
Expand Down

0 comments on commit 9a13f42

Please sign in to comment.