@teamkeel/functions-runtime 0.401.4 → 0.402.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamkeel/functions-runtime",
-  "version": "0.401.4",
+  "version": "0.402.0",
   "description": "Internal package used by @teamkeel/sdk",
   "main": "src/index.js",
   "scripts": {
@@ -31,7 +31,7 @@
     "change-case": "^4.1.2",
     "json-rpc-2.0": "^1.7.0",
     "ksuid": "^3.0.0",
-    "kysely": "~0.25.0",
+    "kysely": "~0.27.5",
     "pg": "^8.13.1",
     "postgres-interval": "^4.0.2",
     "traceparent": "^1.0.0",

package/src/ModelAPI.test.js

@@ -863,15 +863,10 @@ test("ModelAPI.findMany - relationships - duplicate joins handled", async () =>
         name: "Jim",
       },
     })
-    .orWhere({
-      author: {
-        name: "Bob",
-      },
-    })
     .findMany();
 
-  expect(posts.length).toEqual(2);
-  expect(posts.map((x) => x.id).sort()).toEqual([post1.id, post2.id].sort());
+  expect(posts.length).toEqual(1);
+  expect(posts.map((x) => x.id).sort()).toEqual([post1.id].sort());
 });
 
 test("ModelAPI.update", async () => {
@@ -968,12 +963,9 @@ describe("QueryBuilder", () => {
     });
 
     const results = await postAPI
-      .where({ title: { equals: "adam" } })
-      .orWhere({
-        title: { startsWith: "jon" },
-      })
+      .where({ title: { startsWith: "jon" } })
       .findMany({
-        limit: 3,
+        limit: 1,
         offset: 1,
         orderBy: {
           title: "asc",
@@ -982,7 +974,7 @@ describe("QueryBuilder", () => {
 
     // because we've offset by 1, adam should not appear in the results even though
     // the query constraints match adam
-    expect(results).toEqual([three, four]);
+    expect(results).toEqual([four]);
   });
 
   test("ModelAPI.findMany - complex query", async () => {
@@ -1006,7 +998,7 @@ describe("QueryBuilder", () => {
     });
 
     const rows = await personAPI
-      // Will match Jake
+      // Will match Jane
       .where({
         name: {
           startsWith: "J",
@@ -1016,16 +1008,9 @@ describe("QueryBuilder", () => {
           lessThan: 10,
         },
       })
-      // Will match Billy
-      .orWhere({
-        date: {
-          after: new Date("2022-01-01"),
-          before: new Date("2022-01-10"),
-        },
-      })
       .findMany();
-    expect(rows.length).toEqual(2);
-    expect(rows.map((x) => x.id).sort()).toEqual([p.id, p2.id].sort());
+    expect(rows.length).toEqual(1);
+    expect(rows.map((x) => x.id).sort()).toEqual([p.id].sort());
   });
 
   test("ModelAPI chained delete", async () => {
@@ -1065,34 +1050,6 @@ describe("QueryBuilder", () => {
     expect(jake).toEqual(p);
   });
 
-  // test("Model API chained order by", async () => {
-  //   const p1 = await postAPI.create({
-  //     id: KSUID.randomSync().string,
-  //     title: "adam",
-  //   });
-  //   const p2 = await postAPI.create({
-  //     id: KSUID.randomSync().string,
-  //     title: "dave",
-  //   });
-  //   const p3 = await postAPI.create({
-  //     id: KSUID.randomSync().string,
-  //     title: "jon",
-  //   });
-  //   const p4 = await postAPI.create({
-  //     id: KSUID.randomSync().string,
-  //     title: "jon bretman",
-  //   });
-
-  //   const query = postAPI
-  //     .where({ title: "adam" })
-  //     .orWhere({ title: "dave" })
-  //     .orderBy({ title: "desc" });
-
-  //   const results = await query.findMany();
-
-  //   expect(results[0].id).toEqual(p2);
-  // });
-
   test("ModelAPI chained update", async () => {
     const p1 = await postAPI.create({
       id: KSUID.randomSync().string,

package/src/QueryBuilder.js

@@ -38,18 +38,6 @@ class QueryBuilder {
     return new QueryBuilder(this._tableName, context, builder);
   }
 
-  orWhere(where) {
-    const context = this._context.clone();
-
-    let builder = applyJoins(context, this._db, where);
-
-    builder = builder.orWhere((qb) => {
-      return applyWhereConditions(context, qb, where);
-    });
-
-    return new QueryBuilder(this._tableName, context, builder);
-  }
-
   sql() {
     return this._db.compile().sql;
   }
@@ -144,33 +132,6 @@ class QueryBuilder {
     });
   }
 
-  // orderBy(conditions) {
-  //   const context = this._context.clone();
-
-  //   const builder = applyOrderBy(
-  //     context,
-  //     this._db,
-  //     this._tableName,
-  //     conditions
-  //   );
-
-  //   return new QueryBuilder(this._tableName, context, builder);
-  // }
-
-  // limit(limit) {
-  //   const context = this._context.clone();
-  //   const builder = applyLimit(context, this._db, limit);
-
-  //   return new QueryBuilder(this._tableName, context, builder);
-  // }
-
-  // offset(offset) {
-  //   const context = this._context.clone();
-  //   const builder = applyOffset(context, builder, offset);
-
-  //   return new QueryBuilder(this._tableName, context, builder);
-  // }
-
   async findMany(params) {
     const name = tracing.spanNameForModelAPI(this._modelName, "findMany");
     const db = useDatabase();