@cubejs-backend/api-gateway
Advanced tools
Comparing version 0.0.26 to 0.0.27
@@ -36,2 +36,3 @@ const jwt = require('jsonwebtoken'); | ||
dimensions: R.fromPairs((query.dimensions || []).map(annotation('dimensions')).filter(a => !!a)), | ||
segments: R.fromPairs((query.segments || []).map(annotation('segments')).filter(a => !!a)), | ||
timeDimensions: R.fromPairs((query.timeDimensions || []).map(td => annotation('dimensions')(td.dimension)).filter(a => !!a)), // TODO | ||
@@ -56,2 +57,3 @@ } | ||
.concat((query.dimensions || []).map(lookupAlias('dimensions'))) | ||
.concat((query.segments || []).map(lookupAlias('segments'))) | ||
.concat((query.timeDimensions || []).map(td => lookupAlias('dimensions')(td.dimension))) | ||
@@ -67,3 +69,3 @@ .concat(sqlQuery.timeDimensionAlias ? [[sqlQuery.timeDimensionAlias, sqlQuery.timeDimensionField]] : []) | ||
} | ||
return value && value.value ? value.value : value // TODO move to sql adapter | ||
return value && value.value ? value.value : value; // TODO move to sql adapter | ||
}; | ||
@@ -83,4 +85,4 @@ | ||
const id = Joi.string().regex(/^[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+$/) | ||
const dimensionWithTime = Joi.string().regex(/^[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+(\.(hour|day|week|month))?$/) | ||
const id = Joi.string().regex(/^[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+$/); | ||
const dimensionWithTime = Joi.string().regex(/^[a-zA-Z0-9_]+\.[a-zA-Z0-9_]+(\.(hour|day|week|month))?$/); | ||
@@ -120,2 +122,3 @@ const operators = [ | ||
})), | ||
segments: Joi.array().items(id), | ||
timezone: Joi.string(), | ||
@@ -122,0 +125,0 @@ limit: Joi.number().integer().min(1).max(50000) |
@@ -5,3 +5,3 @@ { | ||
"author": "Statsbot, Inc.", | ||
"version": "0.0.26", | ||
"version": "0.0.27", | ||
"engines": { | ||
@@ -26,3 +26,4 @@ "node": ">=8.11.1" | ||
}, | ||
"license": "Apache-2.0" | ||
"license": "Apache-2.0", | ||
"gitHead": "8ab93e21c35a569edb18e8b8f6a04df2e74b48fa" | ||
} |
304
22303