greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Projects Releases 9 Packages Wiki Activity

Sort variable sets to make tests consistent across platforms.

Browse source
This commit is contained in:
Richard Newman 2016-10-04 11:38:14 -07:00
parent 1fe0cbeaf0
commit b777445ebf
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/datomish/query/cc.cljc
View file

@ -62,7 +62,7 @@
[source [source
from ; [[:datoms 'datoms123]] from ; [[:datoms 'datoms123]]
external-bindings ; {?var0 (sql/param :foobar)} external-bindings ; {?var0 (sql/param :foobar)}
bindings ; {?var1 :datoms123.v} bindings ; {?var1 [:datoms123.v]}
known-types ; {?var1 :db.type/integer} known-types ; {?var1 :db.type/integer}
extracted-types ; {?var2 :datoms123.value_type_tag} extracted-types ; {?var2 :datoms123.value_type_tag}
wheres ; [[:= :datoms123.v 15]] wheres ; [[:= :datoms123.v 15]]
@ -162,6 +162,8 @@
bindings)) bindings))
;; This is so we can link clauses to the outside world. ;; This is so we can link clauses to the outside world.
;; Note that we sort the variable list to achieve consistent ordering between
;; Clojure and ClojureScript, yielding sane tests.
(defn- impose-external-bindings [cc] (defn- impose-external-bindings [cc]
(if (empty? (:external-bindings cc)) (if (empty? (:external-bindings cc))
cc cc
@ -177,7 +179,7 @@
(assert external) (assert external)
(assert internal) (assert internal)
[:= external internal])) [:= external internal]))
vars))))) (sort vars))))))
(defn expand-where-from-bindings (defn expand-where-from-bindings
"Take the bindings in the CC and contribute "Take the bindings in the CC and contribute
@ -187,7 +189,7 @@
(impose-external-bindings (impose-external-bindings
(assoc cc :wheres (assoc cc :wheres
;; Note that the order of clauses here means that cross-pattern var bindings ;; Note that the order of clauses here means that cross-pattern var bindings
;; come last That's OK: the SQL engine considers these altogether. ;; come last. That's OK: the SQL engine considers these altogether.
(concat (:wheres cc) (concat (:wheres cc)
(bindings->where (:bindings cc)))))) (bindings->where (:bindings cc))))))