Skip to content

Commit 9a13f42

Browse files
joaosimbiosejoaosimbiose
authored
Merge pull request #26 from SlicingDice/v2.0.3
Release of v2.0.3
2 parents 298bcb7 + adbfab9 commit 9a13f42

File tree

3 files changed

+89
-48
lines changed

3 files changed

+89
-48
lines changed

‎src/slicer.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// RequesterBrowser make http requests from the browser
1212
class RequesterBrowser {
1313
run(token, url, reqType, data = null, sql) {
14-
url = url.hostname + url.path;
1514
let content_type;
1615

1716
if (sql) {
@@ -25,8 +24,6 @@
2524
req.open(reqType, url, true);
2625
req.setRequestHeader("Authorization", token);
2726
req.setRequestHeader('Content-Type', content_type);
28-
req.setRequestHeader('Access-Control-Allow-Origin', '*');
29-
req.setRequestHeader('Access-Control-Allow-Credentials', true);
3027
req.setRequestHeader('Accept', "application/json");
3128
req.onload = function() {
3229
if (req.status == 200) {
@@ -42,7 +39,7 @@
4239
req.onerror = function() {
4340
reject(Error("Network Error"));
4441
};
45-
req.send(JSON.stringify(data));
42+
req.send(sql ? data : JSON.stringify(data));
4643
});
4744
}
4845
}

‎tests_and_examples/examples/delete.json‎

Lines changed: 40 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,47 @@
88
"cardinality": "high",
99
"storage": "latest-value",
1010
"name": "string_test_column",
11-
"api-name": "string-test-column"
11+
"api-name": "string-test-column",
12+
"dimension": "delete-test"
1213
},
1314
{
1415
"storage": "latest-value",
1516
"type": "integer",
1617
"name": "integer_test_column",
17-
"api-name": "integer-test-column"
18+
"api-name": "integer-test-column",
19+
"dimension": "delete-test"
1820
}
1921
],
2022
"insert": {
2123
"Entity1": {
2224
"string-test-column": "value:deleted_entity",
23-
"integer-test-column": 1000001
25+
"integer-test-column": 1000001,
26+
"dimension": "delete-test"
2427
},
2528
"Entity2": {
2629
"string-test-column": "value:deleted_entity",
27-
"integer-test-column": 1000001
30+
"integer-test-column": 1000001,
31+
"dimension": "delete-test"
2832
},
2933
"Entity3": {
3034
"string-test-column": "value:deleted_entity",
31-
"integer-test-column": 1000001
35+
"integer-test-column": 1000001,
36+
"dimension": "delete-test"
3237
},
3338
"Entity4": {
3439
"string-test-column": "value:deleted_entity",
35-
"integer-test-column": 1000001
40+
"integer-test-column": 1000001,
41+
"dimension": "delete-test"
3642
},
3743
"Entity5": {
3844
"string-test-column": "value:deleted_entity",
39-
"integer-test-column": 1000001
45+
"integer-test-column": 1000001,
46+
"dimension": "delete-test"
4047
},
4148
"Entity6": {
4249
"string-test-column": "value:deleted_entity",
43-
"integer-test-column": 1000001
50+
"integer-test-column": 1000001,
51+
"dimension": "delete-test"
4452
}
4553
},
4654
"additional_operation": {
@@ -50,7 +58,8 @@
5058
"equals":"Entity3"
5159
}
5260
}
53-
]
61+
],
62+
"dimension": "delete-test"
5463
},
5564
"result_additional": {
5665
"status": "ignore",
@@ -67,7 +76,8 @@
6776
"equals": "value:deleted_entity"
6877
}
6978
}
70-
]
79+
],
80+
"dimension": "delete-test"
7181
},
7282
"expected": {
7383
"status": "ignore",
@@ -86,39 +96,47 @@
8696
"cardinality": "high",
8797
"storage": "latest-value",
8898
"name": "string_test_column",
89-
"api-name": "string-test-column"
99+
"api-name": "string-test-column",
100+
"dimension": "delete-test"
90101
},
91102
{
92103
"storage": "latest-value",
93104
"type": "integer",
94105
"name": "integer_test_column",
95-
"api-name": "integer-test-column"
106+
"api-name": "integer-test-column",
107+
"dimension": "delete-test"
96108
}
97109
],
98110
"insert": {
99111
"Entity1": {
100112
"string-test-column": "value:deleted_entity",
101-
"integer-test-column": 1000001
113+
"integer-test-column": 1000001,
114+
"dimension": "delete-test"
102115
},
103116
"Entity2": {
104117
"string-test-column": "value:deleted_entity",
105-
"integer-test-column": 1000001
118+
"integer-test-column": 1000001,
119+
"dimension": "delete-test"
106120
},
107121
"Entity3": {
108122
"string-test-column": "value:deleted_entity",
109-
"integer-test-column": 1000001
123+
"integer-test-column": 1000001,
124+
"dimension": "delete-test"
110125
},
111126
"Entity4": {
112127
"string-test-column": "value:not_deleted_entity",
113-
"integer-test-column": 1000001
128+
"integer-test-column": 1000001,
129+
"dimension": "delete-test"
114130
},
115131
"Entity5": {
116132
"string-test-column": "value:not_deleted_entity",
117-
"integer-test-column": 1000001
133+
"integer-test-column": 1000001,
134+
"dimension": "delete-test"
118135
},
119136
"Entity6": {
120137
"string-test-column": "value:not_deleted_entity",
121-
"integer-test-column": 1000001
138+
"integer-test-column": 1000001,
139+
"dimension": "delete-test"
122140
}
123141
},
124142
"additional_operation": {
@@ -128,7 +146,8 @@
128146
"equals":"value:deleted_entity"
129147
}
130148
}
131-
]
149+
],
150+
"dimension": "delete-test"
132151
},
133152
"result_additional": {
134153
"status": "ignore",
@@ -145,7 +164,8 @@
145164
"equals": "value:deleted_entity"
146165
}
147166
}
148-
]
167+
],
168+
"dimension": "delete-test"
149169
},
150170
"expected": {
151171
"status": "ignore",

‎tests_and_examples/examples/update.json‎

Lines changed: 48 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,63 +8,73 @@
88
"cardinality": "high",
99
"storage": "latest-value",
1010
"name": "string_test_column",
11-
"api-name": "string-test-column"
11+
"api-name": "string-test-column",
12+
"dimension": "delete-test"
1213
},
1314
{
1415
"storage": "latest-value",
1516
"type": "boolean",
1617
"name": "boolean_test_column",
17-
"api-name": "boolean-test-column"
18+
"api-name": "boolean-test-column",
19+
"dimension": "delete-test"
1820
},
1921
{
2022
"storage": "latest-value",
2123
"type": "integer",
2224
"name": "integer_test_column",
23-
"api-name": "integer-test-column"
25+
"api-name": "integer-test-column",
26+
"dimension": "delete-test"
2427
},
2528
{
2629
"storage": "latest-value",
2730
"type": "datetime",
2831
"name": "datetime_test_column",
29-
"api-name": "datetime-test-column"
32+
"api-name": "datetime-test-column",
33+
"dimension": "delete-test"
3034
}
3135
],
3236
"insert": {
3337
"Entity1": {
3438
"string-test-column": "value:matched_value",
3539
"boolean-test-column": "true",
3640
"integer-test-column": 1000001,
37-
"datetime-test-column": "2018-01-21T00:50:00Z"
41+
"datetime-test-column": "2018-01-21T00:50:00Z",
42+
"dimension": "delete-test"
3843
},
3944
"Entity2": {
4045
"string-test-column": "value:matched_value",
4146
"boolean-test-column": "true",
4247
"integer-test-column": 1000001,
43-
"datetime-test-column": "2018-01-21T00:50:00Z"
48+
"datetime-test-column": "2018-01-21T00:50:00Z",
49+
"dimension": "delete-test"
4450
},
4551
"Entity3": {
4652
"string-test-column": "value:matched_value",
4753
"boolean-test-column": "true",
4854
"integer-test-column": 1000001,
49-
"datetime-test-column": "2018-01-21T00:50:00Z"
55+
"datetime-test-column": "2018-01-21T00:50:00Z",
56+
"dimension": "delete-test"
5057
},
5158
"Entity4": {
5259
"string-test-column": "value:garbage_value",
5360
"boolean-test-column": "true",
5461
"integer-test-column": 1000001,
55-
"datetime-test-column": "2018-01-21T00:50:00Z"
62+
"datetime-test-column": "2018-01-21T00:50:00Z",
63+
"dimension": "delete-test"
5664
},
5765
"Entity5": {
5866
"string-test-column": "value:garbage_value",
5967
"boolean-test-column": "true",
6068
"integer-test-column": 1000001,
61-
"datetime-test-column": "2018-01-21T00:50:00Z"
69+
"datetime-test-column": "2018-01-21T00:50:00Z",
70+
"dimension": "delete-test"
6271
},
6372
"Entity6": {
6473
"string-test-column": "value:garbage_value",
6574
"boolean-test-column": "true",
6675
"integer-test-column": 1000001,
67-
"datetime-test-column": "2018-01-21T00:50:00Z"
76+
"datetime-test-column": "2018-01-21T00:50:00Z",
77+
"dimension": "delete-test"
6878
}
6979
},
7080
"additional_operation": {
@@ -77,7 +87,8 @@
7787
],
7888
"set":{
7989
"integer-test-column":2000002
80-
}
90+
},
91+
"dimension": "delete-test"
8192
},
8293
"result_additional": {
8394
"status": "ignore",
@@ -94,7 +105,8 @@
94105
"equals": 2000002
95106
}
96107
}
97-
]
108+
],
109+
"dimension": "delete-test"
98110
},
99111
"expected": {
100112
"status": "ignore",
@@ -113,63 +125,73 @@
113125
"cardinality": "high",
114126
"storage": "latest-value",
115127
"name": "string_test_column",
116-
"api-name": "string-test-column"
128+
"api-name": "string-test-column",
129+
"dimension": "delete-test"
117130
},
118131
{
119132
"storage": "latest-value",
120133
"type": "boolean",
121134
"name": "boolean_test_column",
122-
"api-name": "boolean-test-column"
135+
"api-name": "boolean-test-column",
136+
"dimension": "delete-test"
123137
},
124138
{
125139
"storage": "latest-value",
126140
"type": "integer",
127141
"name": "integer_test_column",
128-
"api-name": "integer-test-column"
142+
"api-name": "integer-test-column",
143+
"dimension": "delete-test"
129144
},
130145
{
131146
"storage": "latest-value",
132147
"type": "datetime",
133148
"name": "datetime_test_column",
134-
"api-name": "datetime-test-column"
149+
"api-name": "datetime-test-column",
150+
"dimension": "delete-test"
135151
}
136152
],
137153
"insert": {
138154
"Entity1": {
139155
"string-test-column": "value:matched_value",
140156
"boolean-test-column": "true",
141157
"integer-test-column": 1000001,
142-
"datetime-test-column": "2018-01-21T00:50:00Z"
158+
"datetime-test-column": "2018-01-21T00:50:00Z",
159+
"dimension": "delete-test"
143160
},
144161
"Entity2": {
145162
"string-test-column": "value:matched_value",
146163
"boolean-test-column": "true",
147164
"integer-test-column": 1000001,
148-
"datetime-test-column": "2018-01-21T00:50:00Z"
165+
"datetime-test-column": "2018-01-21T00:50:00Z",
166+
"dimension": "delete-test"
149167
},
150168
"Entity3": {
151169
"string-test-column": "value:matched_value",
152170
"boolean-test-column": "true",
153171
"integer-test-column": 1000001,
154-
"datetime-test-column": "2018-01-21T00:50:00Z"
172+
"datetime-test-column": "2018-01-21T00:50:00Z",
173+
"dimension": "delete-test"
155174
},
156175
"Entity4": {
157176
"string-test-column": "value:garbage_value",
158177
"boolean-test-column": "true",
159178
"integer-test-column": 1000002,
160-
"datetime-test-column": "2018-01-21T00:50:00Z"
179+
"datetime-test-column": "2018-01-21T00:50:00Z",
180+
"dimension": "delete-test"
161181
},
162182
"Entity5": {
163183
"string-test-column": "value:garbage_value",
164184
"boolean-test-column": "true",
165185
"integer-test-column": 1000002,
166-
"datetime-test-column": "2018-01-21T00:50:00Z"
186+
"datetime-test-column": "2018-01-21T00:50:00Z",
187+
"dimension": "delete-test"
167188
},
168189
"Entity6": {
169190
"string-test-column": "value:garbage_value",
170191
"boolean-test-column": "true",
171192
"integer-test-column": 1000002,
172-
"datetime-test-column": "2018-01-21T00:50:00Z"
193+
"datetime-test-column": "2018-01-21T00:50:00Z",
194+
"dimension": "delete-test"
173195
}
174196
},
175197
"additional_operation": {
@@ -191,7 +213,8 @@
191213
"boolean-test-column": "false",
192214
"integer-test-column": 3000003,
193215
"datetime-test-column": "2018-01-24T10:50:00Z"
194-
}
216+
},
217+
"dimension": "delete-test"
195218
},
196219
"result_additional": {
197220
"status": "ignore",
@@ -226,7 +249,8 @@
226249
"equals": "2018-01-24T10:50:00Z"
227250
}
228251
}
229-
]
252+
],
253+
"dimension": "delete-test"
230254
},
231255
"expected": {
232256
"status": "ignore",

0 commit comments

Comments
 (0)