Skip to content

Commit 10acee7

Browse files
committed
Use azql.
1 parent b7e66b0 commit 10acee7

5 files changed

Lines changed: 18 additions & 13 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@
1212
out
1313
Hyperspace.iml
1414

15+
.nrepl-port
16+
1517
hyperspace-server.*.db

project.clj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
(defproject hyperspace "1.0.0-SNAPSHOT"
22
:description "Simple 2D game written in Clojure."
3-
:dependencies [[azql "0.1.0"]
3+
:dependencies [[azql "0.2.0"]
44
[clj-liquibase "0.5.2"]
55
[com.h2database/h2 "1.3.173"]
66
[crypto-password "0.1.3"]

src/hyperspace/server/database/datasource.clj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
(ns hyperspace.server.database.datasource
2-
(:require [clj-liquibase.cli :as cli]
2+
(:require [azql.emit :as emit]
3+
[azql.dialect :as dialect]
4+
[clj-liquibase.cli :as cli]
35
[hyperspace.server.database.migrations :as migrations])
46
(:use [hyperspace.server.config :only [config]])
57
(:import [org.h2.jdbcx JdbcConnectionPool]))
@@ -12,3 +14,9 @@
1214
(cli/update {:datasource ds
1315
:changelog migrations/changelog})
1416
ds))
17+
18+
(dialect/register-dialect ::h2)
19+
(defmethod dialect/guess-dialect :h2 [_] ::h2)
20+
(defmethod emit/quote-name ::h2 [name] (str name))
21+
22+
(def db-spec {:datasource datasource})
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
(ns hyperspace.server.database.user
22
(:require [crypto.password.scrypt :as password])
3-
(:use [hyperspace.server.database.datasource :only [datasource]]
4-
[azql.core :only [insert! values]]))
3+
(:use [azql.core :only [select from insert! values]]
4+
[hyperspace.server.database.datasource :only [db-spec]]))
55

66
(defn create [login password]
7-
'())
8-
9-
;;
10-
;;
11-
;; (insert! datasource :user
12-
;; (values [{:login login
13-
;; :password (password/encrypt password)}]))
7+
(insert! db-spec :users
8+
(values [{:login login
9+
:password (password/encrypt password)}])))

src/hyperspace/swagger/server.clj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,4 @@
1919
:query-params [login :- String
2020
password :- String]
2121
:summary "register user"
22-
(user/create login password)
23-
(ok))))
22+
(ok (user/create login password)))))

0 commit comments

Comments
 (0)