Skip to content

Commit 3915250

Browse files
committed
Allow upsert by implicit tuple when only tuple components are specified (closes #473)
1 parent 6cc18bc commit 3915250

File tree

10 files changed

+313
-174
lines changed

10 files changed

+313
-174
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
- Stable sorting of sequences of various types #470
44
- Correctly restore `:max-tx` from storage
55
- Fixed tempid/upsert resolution when multiple tempids are added first #472
6+
- Allow upsert by implicit tuple when only tuple components are specified #473
67

78
# 1.6.5 - May 3, 2024
89

deps.edn

Lines changed: 44 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,51 @@
1-
{
2-
:deps {
3-
persistent-sorted-set/persistent-sorted-set {:mvn/version "0.3.0"}
4-
io.github.tonsky/extend-clj {:mvn/version "0.1.0"}
5-
}
1+
{:deps
2+
{persistent-sorted-set/persistent-sorted-set {:mvn/version "0.3.0"}
3+
io.github.tonsky/extend-clj {:mvn/version "0.1.0"}}
64

7-
:aliases {
8-
:1.9 {
9-
:override-deps {
10-
org.clojure/clojure {:mvn/version "1.9.0"}
11-
}
12-
}
5+
:aliases
6+
{:cljs
7+
{:extra-paths ["test"]
8+
:extra-deps
9+
{org.clojure/clojurescript {:mvn/version "1.11.132"}}}
1310

14-
:1.10 {
15-
:override-deps {
16-
org.clojure/clojure {:mvn/version "1.10.2"}
17-
}
18-
}
11+
:1.9
12+
{:override-deps
13+
{org.clojure/clojure {:mvn/version "1.9.0"}}}
14+
15+
:1.10
16+
{:override-deps
17+
{org.clojure/clojure {:mvn/version "1.10.2"}}}
1918

20-
:1.11.1 {
21-
:override-deps {
22-
org.clojure/clojure {:mvn/version "1.11.1"}
23-
}
24-
}
19+
:1.11.1
20+
{:override-deps
21+
{org.clojure/clojure {:mvn/version "1.11.1"}}}
2522

26-
:dev {
27-
:extra-paths ["dev"]
28-
:extra-deps {
29-
io.github.tonsky/duti {:git/sha "0e934d934b0b5d1ab1a608f26b68f5467934b028"}
30-
}
31-
}
23+
:dev
24+
{:extra-paths ["dev"]
25+
:extra-deps
26+
{io.github.tonsky/duti {:git/sha "fc833a87a8687b67e66281e216eeee1ad6048168"}}}
3227

33-
:test {
34-
:extra-paths ["test"]
35-
:extra-deps {
36-
org.clojure/clojurescript {:mvn/version "1.10.520"}
37-
metosin/jsonista {:mvn/version "0.3.3"}
38-
cheshire/cheshire {:mvn/version "5.10.0"}
39-
com.cognitect/transit-clj {:mvn/version "1.0.324"}
40-
com.cognitect/transit-cljs {:mvn/version "0.8.269"}
41-
}
42-
}
28+
:test
29+
{:extra-paths ["test"]
30+
:extra-deps
31+
{org.clojure/clojurescript {:mvn/version "1.10.520"}
32+
metosin/jsonista {:mvn/version "0.3.3"}
33+
cheshire/cheshire {:mvn/version "5.10.0"}
34+
com.cognitect/transit-clj {:mvn/version "1.0.324"}
35+
com.cognitect/transit-cljs {:mvn/version "0.8.269"}}}
4336

44-
:bench {
45-
:extra-paths ["bench"]
46-
:jvm-opts ["-server"
47-
"-XX:+UnlockDiagnosticVMOptions"
48-
"-Djdk.attach.allowAttachSelf"
49-
"-XX:+DebugNonSafepoints"]
50-
:extra-deps {
51-
metosin/jsonista {:mvn/version "0.3.3"}
52-
criterium/criterium {:mvn/version "0.4.6"}
53-
com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.0.0"}
54-
}
55-
}
37+
:bench
38+
{:extra-paths ["bench"]
39+
:jvm-opts ["-server"
40+
"-XX:+UnlockDiagnosticVMOptions"
41+
"-Djdk.attach.allowAttachSelf"
42+
"-XX:+DebugNonSafepoints"]
43+
:extra-deps
44+
{metosin/jsonista {:mvn/version "0.3.3"}
45+
criterium/criterium {:mvn/version "0.4.6"}
46+
com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.0.0"}}}
5647

57-
:datomic {
58-
:extra-paths ["bench_datomic" "test_datomic"]
59-
:extra-deps {
60-
com.datomic/peer {:mvn/version "1.0.6735"}
61-
}
62-
}
63-
}
64-
}
48+
:datomic
49+
{:extra-paths ["bench_datomic" "test_datomic"]
50+
:extra-deps
51+
{com.datomic/peer {:mvn/version "1.0.6735"}}}}}

dev/user.clj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
(duti/start-socket-repl))
1414

1515
(defn test-all []
16-
(reload)
1716
(duti/test #"datascript\.test\..*"))
1817

1918
(defn -test-main [_]
20-
(reload {:only #"datascript\.test\..*"})
2119
(duti/test-exit #"datascript\.test\..*"))

0 commit comments

Comments
 (0)