File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1212out
1313Hyperspace.iml
1414
15+ .nrepl-port
16+
1517hyperspace-server. * .db
Original file line number Diff line number Diff line change 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" ]
Original file line number Diff line number Diff line change 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]))
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})
Original file line number Diff line number Diff line change 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)}])))
Original file line number Diff line number Diff line change 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)))))
You can’t perform that action at this time.
0 commit comments