fix: update queries with now bind

comake · Mar 3, 2023 · 978e9d9 · 978e9d9
1 parent 04baacd
commit 978e9d9
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 32 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@comake/skl-js-engine",
-	"version": "0.3.1",
+	"version": "0.3.2",
 	"description": "Standard Knowledge Language Javascript Engine",
 	"keywords": [
 		"skl",

diff --git a/src/storage/sparql/SparqlUpdateBuilder.ts b/src/storage/sparql/SparqlUpdateBuilder.ts
@@ -7,8 +7,8 @@ import type {
   GraphQuads,
   Triple,
   InsertDeleteOperation,
-  SelectQuery,
   UpdateOperation,
+  BindPattern,
 } from 'sparqljs';
 import {
   rdfTypeNamedNode,
@@ -221,14 +221,22 @@ export class SparqlUpdateBuilder {
       updates.push({
         updateType: 'deletewhere',
         delete: deletions,
-      } as InsertDeleteOperation);
+      });
     }
     if (insertions.length > 0) {
-      const insert = { updateType: 'insert', insert: insertions } as InsertDeleteOperation;
       if (this.setTimestamps) {
-        insert.where = [ this.selectNow() ];
+        updates.push({
+          updateType: 'insertdelete',
+          delete: [],
+          insert: insertions,
+          where: [ this.bindNow() ],
+        });
+      } else {
+        updates.push({
+          updateType: 'insert',
+          insert: insertions,
+        });
       }
-      updates.push(insert);
     }
     return updates;
   }
@@ -241,21 +249,15 @@ export class SparqlUpdateBuilder {
     };
   }
 
-  private selectNow(): SelectQuery {
+  private bindNow(): BindPattern {
     return {
-      type: 'query',
-      queryType: 'SELECT',
-      prefixes: {},
-      variables: [ now ],
-      where: [{
-        type: 'bind',
-        variable: now,
-        expression: {
-          type: 'operation',
-          operator: 'now',
-          args: [],
-        },
-      }],
+      type: 'bind',
+      variable: now,
+      expression: {
+        type: 'operation',
+        operator: 'now',
+        args: [],
+      },
     };
   }
 }
diff --git a/test/deploy/package.json b/test/deploy/package.json
@@ -7,7 +7,7 @@
 	},
 	"main": "./dist/index.js",
 	"dependencies": {
-		"@comake/skl-js-engine": "file:./comake-skl-js-engine-0.3.1.tgz",
+		"@comake/skl-js-engine": "file:./comake-skl-js-engine-0.3.2.tgz",
 		"jsonld": "^6.0.0"
 	},
 	"devDependencies": {

diff --git a/test/unit/storage/sparql/SparqlUpdateBuilder.test.ts b/test/unit/storage/sparql/SparqlUpdateBuilder.test.ts
@@ -205,7 +205,8 @@ describe('A SparqlUpdateBuilder', (): void => {
           }],
         },
         {
-          updateType: 'insert',
+          updateType: 'insertdelete',
+          delete: [],
           insert: [
             {
               type: 'graph',
@@ -217,21 +218,17 @@ describe('A SparqlUpdateBuilder', (): void => {
               ],
             },
           ],
-          where: [{
-            type: 'query',
-            queryType: 'SELECT',
-            prefixes: {},
-            variables: [ now ],
-            where: [{
+          where: [
+            {
               type: 'bind',
               variable: now,
               expression: {
                 type: 'operation',
                 operator: 'now',
                 args: [],
               },
-            }],
-          }],
+            },
+          ],
         },
       ],
     };