Support JS arrays as lookup refs in datoms and queries (closes tonsky…

…#179)
alexei-matveev · Sep 26, 2016 · 4b7e2c4 · 4b7e2c4
1 parent 7dada20
commit 4b7e2c4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # WIP
 
 - ~30% better performance for predicate and fn calls in queries
+- JS API now supports lookup refs in index lookups and queries (#179)
 
 # 0.15.3
 

diff --git a/src/datascript/db.cljc b/src/datascript/db.cljc
@@ -740,10 +740,11 @@
           nil
         :else
           (:e (first (-datoms db :avet eid))))
-   :else
-     (raise "Expected number or lookup ref for entity id, got " eid
-             {:error :entity-id/syntax
-              :entity-id eid})))
+    #?@(:cljs [(array? eid) (recur db (array-seq eid))])
+    :else
+      (raise "Expected number or lookup ref for entity id, got " eid
+              {:error :entity-id/syntax
+               :entity-id eid})))
 
 (defn entid-strict [db eid]
   (or (entid db eid)

diff --git a/test/datascript/test/lookup_refs.cljc b/test/datascript/test/lookup_refs.cljc
@@ -196,11 +196,11 @@
                     [{:db/id 1 :id 1 :name "Ivan" :age 11 :friend 2}
                      {:db/id 2 :id 2 :name "Petr" :age 22 :friend 3}
                      {:db/id 3 :id 3 :name "Oleg" :age 33 }])]
-    (is (= (set (d/q '[:find [?v ...]
+    (is (= (set (d/q '[:find ?e ?v
                        :in $ ?e
                        :where [?e :age ?v]]
                      db [:name "Ivan"]))
-           #{11}))
+           #{[[:name "Ivan"] 11]}))
 
     (is (= (set (d/q '[:find [?v ...]
                        :in $ [?e ...]

diff --git a/test/js/tests.js b/test/js/tests.js
@@ -307,15 +307,25 @@ function test_pull() {
 function test_lookup_refs() {
   var schema = {"name": {":db/unique": ":db.unique/identity"}};
   var db = d.db_with(d.empty_db(schema),
-                     [{":db/id": 1, "name": "Ivan"},
-                      {":db/id": 2, "name": "Oleg"}]);
-
+                     [{":db/id": 1, "name": "Ivan", "age": 18},
+                      {":db/id": 2, "name": "Oleg", "age": 32}]);
+  // entity
   assert_eq("Ivan", d.entity(db, ["name", "Ivan"]).get("name"));
+  // pull
   assert_eq({"name": "Ivan"}, d.pull(db, '["name"]', ["name", "Ivan"]));
   assert_eq_set(
     [{"name": "Ivan"}, {"name": "Oleg"}],
     d.pull_many(db, '["name"]', [["name", "Ivan"], ["name", "Oleg"]])
   );
+  // index access
+  assert_eq_datoms([[1, "age", 18, tx0+1],
+                    [1, "name", "Ivan", tx0+1]],
+                   d.datoms(db, ":eavt", ["name", "Ivan"]));
+  // queries
+  assert_eq([[["name", "Ivan"], 18]], 
+            d.q('[:find ?e ?a\
+                  :in $ ?e \
+                  :where [?e "age" ?a]]', db, ["name", "Ivan"]));
 }
 
 function test_resolve_current_tx() {