diff --git a/scripts/schema.ts b/scripts/schema.ts
index 1a8ced75b1fadc8e461afd1d436addc168035dd1..10f3ab7c1b6255ca3c8308f6839cf7e261a72d0a 100755
--- a/scripts/schema.ts
+++ b/scripts/schema.ts
@@ -23,6 +23,7 @@
import { Engine } from "../src/core/engine";
import { PostgresAdapter } from "../src/adapter/postgres";
import { ConfigParser } from "../src/util/configParser";
+import { QueryOpts, Query } from "../src/common/query";
import * as path from "path";
import * as fs from "fs";
@@ -37,13 +38,12 @@ const configFile = process.argv[2];
const schemaFile = process.argv[3];
const config = ConfigParser.parse(configFile);
const referencePath = path.dirname(configFile);
-const engine = new Engine();
-const adapter = new PostgresAdapter(config.connection);
+
+const engine = new Engine(config);
+const adapter = new PostgresAdapter(config.connection);
let schema = "";
-config.metrics.forEach ((met) => engine.addMetric(met));
-config.dimensions.forEach ((dim) => engine.addDimension(dim));
for (let i = 0; i < config.buildViews.length; ++i) {
const view = config.buildViews[i].view;
@@ -77,11 +77,9 @@ for (let i = 0; i < config.buildViews.length; ++i) {
const view = config.buildViews[i].view;
const alias = config.buildViews[i].alias;
if (!view.origin) {
- const materializedView = engine.query({
- metrics: view.metrics,
- dimensions: view.dimensions,
- clauses: view.clauses
- });
+ const qOpt: QueryOpts = { metrics: view.metrics,dimensions: view.dimensions,
+ clauses: view.clauses };
+ const materializedView = engine.query(new Query(qOpt));
const table = adapter.getQueryFromView(materializedView);
let query = "-- View: " + alias + "\n";
diff --git a/src/api/middlewares/engine.ts b/src/api/middlewares/engine.ts
index bec7ae41b46b62eb470d2d9a08079241e5238f5c..6230f2b6ac423376f342269cf3ce7980ba6064bc 100644
--- a/src/api/middlewares/engine.ts
+++ b/src/api/middlewares/engine.ts
@@ -28,13 +28,7 @@ import { Middleware } from "../types";
* @param config - Parsed database schema.
*/
export function EngineMw (config: ParsedConfig): Middleware {
- let engine: Engine = new Engine();
-
- config.metrics.forEach ((met) => engine.addMetric(met));
- config.dimensions.forEach ((dim) => engine.addDimension(dim));
- config.views.forEach ((view) => engine.addView(view));
- config.enumTypes.forEach ((enumt) => engine.addEnumType(enumt));
- config.sources.forEach ((sourc) => engine.addSource(sourc));
+ let engine: Engine = new Engine(config);
return function engineMiddleware(req, res, next) {
req.engine = engine;
diff --git a/src/core/engine.spec.ts b/src/core/engine.spec.ts
index 6d8973a9f871635284a461bc3e807301fe9e19c4..11addc30e84004714857905fdc4f5f69f0838bf0 100644
--- a/src/core/engine.spec.ts
+++ b/src/core/engine.spec.ts
@@ -23,30 +23,15 @@ import { Engine } from "./engine";
import { FilterOperator } from "./filter";
import { View } from "./view";
import { engineScenario } from "../../test/scenario";
+import { ConfigParser } from "../util/configParser";
describe("engine class", () => {
- const engine = new Engine();
- const met = engineScenario.metrics;
- const dim = engineScenario.dimensions;
+ const configPath = process.env.BLENDB_SCHEMA_FILE;
+ let config = ConfigParser.parse(configPath);
+ const engine = new Engine(config);
const subdim = engineScenario.subDimensions;
- const views = engineScenario.views;
- for (let key in met){
- if (met[key]){
- engine.addMetric(met[key]);
- }
- }
- for (let key in dim){
- if (dim[key]){
- engine.addDimension(dim[key]);
- }
- }
- for (let key in views){
- if (views[key]){
- engine.addView(views[key]);
- }
- }
for (let key in subdim){
if (subdim[key]){
engine.addDimension(subdim[key]);
@@ -166,7 +151,7 @@ describe("engine class", () => {
expect(clause.filters[0]).to.have.property("target");
expect(clause.filters[0]).to.have.property("value");
expect(clause.filters[0]).to.have.property("operator");
- expect(clause.filters[0].target).to.be.equal(dim["dim:client:name"]);
+ expect(clause.filters[0].target).to.be.equal(engine.getDimensionByName("dim:client:name"));
expect(clause.filters[0].value).to.be.equal("Laci");
expect(clause.filters[0].operator).to.be.equal(FilterOperator.EQUAL);
});
@@ -183,7 +168,7 @@ describe("engine class", () => {
expect(clause.filters[0]).to.have.property("target");
expect(clause.filters[0]).to.have.property("operator");
expect(clause.filters[0]).to.have.property("value");
- expect(clause.filters[0].target).to.be.equal(met["met:product:avg:pricein"]);
+ expect(clause.filters[0].target).to.be.equal(engine.getMetricByName("met:product:avg:pricein"));
expect(clause.filters[0].value).to.be.equal("0");
expect(clause.filters[0].operator).to.be.equal(FilterOperator.NOTEQUAL);
});
@@ -284,7 +269,7 @@ describe("engine class", () => {
expect(clause.filters[0]).to.have.property("target");
expect(clause.filters[0]).to.have.property("operator");
expect(clause.filters[0]).to.have.property("value");
- expect(clause.filters[0].target).to.be.equal(dim["dim:sell:datein"]);
+ expect(clause.filters[0].target).to.be.equal(engine.getDimensionByName("dim:sell:datein"));
expect(clause.filters[0].value).to.be.equal("2018-02-17");
expect(clause.filters[0].operator).to.be.equal(operators[op]);
}
@@ -301,7 +286,7 @@ describe("engine class", () => {
expect(clause.filters[0]).to.have.property("target");
expect(clause.filters[0]).to.have.property("operator");
expect(clause.filters[0]).to.have.property("value");
- expect(clause.filters[0].target).to.be.equal(dim["dim:seller:id"]);
+ expect(clause.filters[0].target).to.be.equal(engine.getDimensionByName("dim:seller:id"));
expect(clause.filters[0].value).to.be.equal("0");
expect(clause.filters[0].operator).to.be.equal(operators[op]);
}
diff --git a/src/core/engine.ts b/src/core/engine.ts
index 1678e216ca84e986db251db81163d7561fdeff27..6c100456bb96da5fab3a75180acd8577d5fdc746 100644
--- a/src/core/engine.ts
+++ b/src/core/engine.ts
@@ -28,6 +28,7 @@ import { Graph } from "../util/graph";
import { EnumType, EnumTypeOptions} from "./enumType";
import { Source , SourceStrOptions } from "./source";
import { ViewHandler } from "../util/viewHandler";
+import { ParsedConfig } from "../util/configParser";
/**
* Represents the database schema from the BlenDB perspective.
@@ -52,13 +53,16 @@ export class Engine {
private graph: Graph;
/** Constructs an empty database schema. */
- constructor () {
- this.enumTypes = [];
- this.views = [];
- this.metrics = [];
- this.dimensions = [];
- this.sources = [];
+ constructor (config: ParsedConfig) {
+
this.graph = new Graph();
+
+ config.metrics.forEach ((met) => this.addMetric(met));
+ config.dimensions.forEach ((dim) => this.addDimension(dim));
+ config.views.forEach ((view) => this.addView(view));
+ config.enumTypes.forEach ((enumt) => this.addEnumType(enumt));
+ config.sources.forEach ((sourc) => this.addSource(sourc));
+
}
/** Gets all the available */
diff --git a/src/util/scenarioHandler.ts b/src/util/scenarioHandler.ts
index f0b55945d495a56d9cae9c52cd8d969fa924b31c..6e2a0ec2c63cb8030784b54f7cdae6b28bd4222a 100644
--- a/src/util/scenarioHandler.ts
+++ b/src/util/scenarioHandler.ts
@@ -24,14 +24,6 @@ import { Dimension } from "../core/dimension";
import { Query } from "../common/query";
export interface EngineScenario {
- /**
- * All metrics from /config/*
- */
- metrics: {[key: string]: Metric};
- /**
- * All dimensions from /config/*
- */
- dimensions: {[key: string]: Dimension};
/**
* subDimensions from scenario
*/
@@ -44,10 +36,6 @@ export interface EngineScenario {
* Dimension that does not exist on /config/*
*/
wrongDim: Dimension;
- /**
- * All views from /config/*
- */
- views: {[key: string]: View};
/**
* Query that have all metrics and dimensions
*/
diff --git a/test/scenario.ts b/test/scenario.ts
index 882c8405069fab3eab5e73ebe4e2772aa3f88a70..12b021ce582811e7783345b38e5050c910e98789 100644
--- a/test/scenario.ts
+++ b/test/scenario.ts
@@ -365,12 +365,9 @@ const viewActiveSeller = views["view:ActiveSeller"];
// Exports
export const engineScenario: EngineScenario = {
- metrics: mets,
- dimensions: dims,
wrongMet: wrongMet,
wrongDim: wrongDim,
subDimensions: subdims,
- views: views,
queryMetsDims: queries["queryMetsDims"],
queryNoMets: queries["queryNoMets"],
queryNoDims: queries["queryNoDims"],