@koralium/base-client 1.3.0-alpha6 → 1.3.1

package/lib/koraliumClient.d.ts

@@ -1,5 +1,5 @@
 import { QueryOptions, QueryResult } from ".";
 export interface KoraliumClient {
-    queryScalar(sql: string, parameters?: {} | null, headers?: {}): Promise<any>;
+    queryScalar(sql: string, queryOptions?: QueryOptions): Promise<any>;
     query(sql: string, queryOptions?: QueryOptions): Promise<QueryResult>;
 }

package/lib/parameterBuilder.js

@@ -32,7 +32,7 @@ class ParameterBuilder {
     getParameters() {
         const output = {};
         for (let [key, value] of Object.entries(this.valuesToParameters)) {
-            output[value] = key;
+            output[value] = encodeURIComponent(key);
         }
         return output;
     }

package/lib/parameterBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"parameterBuilder.js","sourceRoot":"","sources":["../src/parameterBuilder.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;GAYG;AACH,MAAa,gBAAgB;IAA7B;QACE,uBAAkB,GAA6B,EAAE,CAAA;QACjD,YAAO,GAAW,CAAC,CAAC;IAoBtB,CAAC;IAlBC,gBAAgB,CAAC,KAAsB;QACnC,IAAI,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;YAC9C,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;SACzC;aACI;YACD,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAC1C,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;YAC9C,OAAO,YAAY,CAAC;SACvB;IACL,CAAC;IAED,aAAa;QACX,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,KAAK,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;YAChE,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC;SACrB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtBD,4CAsBC"}
+{"version":3,"file":"parameterBuilder.js","sourceRoot":"","sources":["../src/parameterBuilder.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;GAYG;AACH,MAAa,gBAAgB;IAA7B;QACE,uBAAkB,GAA6B,EAAE,CAAA;QACjD,YAAO,GAAW,CAAC,CAAC;IAoBtB,CAAC;IAlBC,gBAAgB,CAAC,KAAsB;QACnC,IAAI,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE;YAC9C,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;SACzC;aACI;YACD,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAC1C,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,YAAY,CAAC;YAC9C,OAAO,YAAY,CAAC;SACvB;IACL,CAAC;IAED,aAAa;QACX,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,KAAK,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;YAChE,MAAM,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;SACzC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtBD,4CAsBC"}

package/lib/queryResult.d.ts

@@ -2,8 +2,10 @@ export declare class Metadata {
     customMetadata: {};
     constructor(customMetadata: {});
 }
-export declare class QueryResult {
-    rows: Array<{}>;
+export declare class QueryResult<T extends {
+    [key: string]: any;
+} = any> {
+    rows: Array<T>;
     metadata: Metadata;
-    constructor(rows: Array<{}>, metadata: Metadata);
+    constructor(rows: Array<T>, metadata: Metadata);
 }

package/lib/queryResult.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryResult.js","sourceRoot":"","sources":["../src/queryResult.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;GAYG;AACH,MAAa,QAAQ;IAGnB,YAAY,cAAkB;QAC5B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;CACF;AAND,4BAMC;AAED,MAAa,WAAW;IAItB,YAAY,IAAe,EAAE,QAAkB;QAC7C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AARD,kCAQC"}
+{"version":3,"file":"queryResult.js","sourceRoot":"","sources":["../src/queryResult.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;GAYG;AACH,MAAa,QAAQ;IAGnB,YAAY,cAAkB;QAC5B,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACvC,CAAC;CACF;AAND,4BAMC;AAED,MAAa,WAAW;IAItB,YAAY,IAAc,EAAE,QAAkB;QAC5C,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;CACF;AARD,kCAQC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koralium/base-client",
-  "version": "1.3.0-alpha6",
+  "version": "1.3.1",
   "main": "./lib/index.js",
   "license": "MIT",
   "scripts": {
@@ -28,5 +28,5 @@
     "ts-node": "^8.10.2",
     "typescript": "^3.2.2"
   },
-  "gitHead": "f4c208a65e77cd1d4e9dabcc7f5c3e0c3e3a02a4"
+  "gitHead": "865598af01038cca8d14da8e4ba0a54fab170ff2"
 }

package/src/koraliumClient.ts

@@ -14,6 +14,6 @@
 import { QueryOptions, QueryResult } from ".";
 
 export interface KoraliumClient {
-  queryScalar(sql: string, parameters?: {} | null, headers?: {}): Promise<any>
+  queryScalar(sql: string, queryOptions?: QueryOptions): Promise<any>
   query(sql: string, queryOptions?: QueryOptions): Promise<QueryResult>;
 }

package/src/parameterBuilder.ts

@@ -29,7 +29,7 @@ export class ParameterBuilder {
   getParameters(): {} {
     const output: {[key: string]: string;} = {};
     for (let [key, value] of Object.entries(this.valuesToParameters)) {
-      output[value] = key;
+      output[value] = encodeURIComponent(key);
     }
     return output;
   }

package/src/queryResult.ts

@@ -19,11 +19,11 @@ export class Metadata {
   }
 }
 
-export class QueryResult {
-  rows: Array<{}>;
+export class QueryResult<T extends { [key: string]: any; } = any> {
+  rows: Array<T>;
   metadata: Metadata;
 
-  constructor(rows: Array<{}>, metadata: Metadata) {
+  constructor(rows: Array<T>, metadata: Metadata) {
     this.rows = rows;
     this.metadata = metadata;
   }

package/test-report.xml

@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testExecutions version="1">
   <file path="C:\Users\seosal\source\repos\Koralium\new\Koralium\typescript-client\base-client\tests\queryBuilder.test.ts">
-    <testCase name="count with filter" duration="3"/>
+    <testCase name="count with filter" duration="8"/>
     <testCase name="Select same column" duration="1"/>
-    <testCase name="Select with limit and offset" duration="0"/>
-    <testCase name="Select multiple columns, filter, limit, offset" duration="0"/>
-    <testCase name="Object mapper" duration="1"/>
-    <testCase name="Object mapper, missing mapping" duration="0"/>
-    <testCase name="Filter builder equals" duration="1"/>
-    <testCase name="test in predicate for numbers" duration="1"/>
+    <testCase name="Select with limit and offset" duration="1"/>
+    <testCase name="Select multiple columns, filter, limit, offset" duration="1"/>
+    <testCase name="Object mapper" duration="2"/>
+    <testCase name="Object mapper, missing mapping" duration="1"/>
+    <testCase name="Filter builder equals" duration="3"/>
+    <testCase name="test in predicate for numbers" duration="0"/>
     <testCase name="test in predicate for strings" duration="0"/>
     <testCase name="Order by with object ascending" duration="1"/>
     <testCase name="Order by with object descending" duration="0"/>
-    <testCase name="Empty filter string" duration="0"/>
-    <testCase name="Empty filter object" duration="1"/>
-    <testCase name="Search filter all fields" duration="0"/>
+    <testCase name="Empty filter string" duration="1"/>
+    <testCase name="Empty filter object" duration="0"/>
+    <testCase name="Search filter all fields" duration="1"/>
     <testCase name="Search filter two fields" duration="1"/>
-    <testCase name="Boolean filter" duration="0"/>
+    <testCase name="Boolean filter" duration="1"/>
     <testCase name="IN filter with strings" duration="1"/>
-    <testCase name="IN filter with numbers" duration="0"/>
-    <testCase name="IN filter with booleans" duration="1"/>
+    <testCase name="IN filter with numbers" duration="2"/>
+    <testCase name="IN filter with booleans" duration="2"/>
+    <testCase name="filter with åäö" duration="1"/>
   </file>
 </testExecutions>

package/tests/queryBuilder.test.ts

@@ -306,4 +306,24 @@ test("IN filter with booleans", () => {
     .buildQuery();
 
     expect(result).toEqual(expected);
-});
+});
+
+test("filter with åäö", () => {
+  const expected = "SELECT count(*) FROM testtable WHERE (name IN (@P0))"
+
+  const queryBuilder = new QueryBuilder("testtable");
+  const result = queryBuilder
+    .addSelectElement("count(*)")
+    .addFilter({
+      name: {in: ["åäö"]}
+    })
+    .buildQuery();
+
+    const parametersResult = queryBuilder.getParameters();
+    const expectedParameters = {
+      P0: encodeURIComponent("åäö")
+    };
+
+    expect(result).toEqual(expected);
+    expect(parametersResult).toEqual(expectedParameters);
+})