Squirrel-parse generated routes and queries are now working

Routes and queries auto-generated from migrations by [squirrel-parse](https://github.com/simon-brooke/squirrel-parse) are now actually working!
This commit is contained in:
Simon Brooke 2018-03-17 18:33:06 +00:00
parent 9157871cc1
commit f23e52a65b
15 changed files with 1923 additions and 16 deletions

View file

@ -15,14 +15,14 @@
Timestamp
PreparedStatement]))
(def ^:dynamic *db* {:name "java:comp/env/jdbc/EmployeeDB"})
;; (defstate ^:dynamic *db*
;; :start (conman/connect! {:jdbc-url-env (env :database-url)
;; :jdbc-url "jdbc:postgresql://127.0.0.1/youyesyet_dev?user=youyesyet&password=thisisnotsecure"
;; :driver-class-name "org.postgresql.Driver"})
;; :stop (conman/disconnect! *db*))
;; (def ^:dynamic *db* {:name "java:comp/env/jdbc/EmployeeDB"})
(defstate ^:dynamic *db*
:start (conman/connect! {:jdbc-url-env (env :database-url)
:jdbc-url "jdbc:postgresql://127.0.0.1/youyesyet_dev?user=youyesyet&password=thisisnotsecure"
:driver-class-name "org.postgresql.Driver"})
:stop (conman/disconnect! *db*))
(conman/bind-connection *db* "sql/queries.sql")
(conman/bind-connection *db* "sql/queries.auto.sql")
(defn to-date [^java.sql.Date sql-date]
(-> sql-date (.getTime) (java.util.Date.)))

View file

@ -3,6 +3,7 @@
[youyesyet.layout :refer [error-page]]
[youyesyet.routes.home :refer [home-routes]]
[youyesyet.routes.oauth :refer [oauth-routes]]
[youyesyet.routes.auto-json-routes :refer [auto-rest-routes]]
[compojure.route :as route]
[youyesyet.env :refer [defaults]]
[mount.core :as mount]
@ -37,6 +38,9 @@
(-> #'home-routes
(wrap-routes middleware/wrap-csrf)
(wrap-routes middleware/wrap-formats))
(-> #'auto-rest-routes
(wrap-routes middleware/wrap-csrf)
(wrap-routes middleware/wrap-formats))
#'oauth-routes
(route/not-found
(:body
@ -44,4 +48,5 @@
:title "page not found"})))))
(def app (middleware/wrap-base #'app-routes))
(def app #'app-routes)
;;(middleware/wrap-base #'app-routes))

File diff suppressed because it is too large Load diff

View file

@ -40,7 +40,7 @@
(defn get-issues
"Get current issues. No arguments expected."
[request]
[request])
(defroutes rest-routes
(GET "/rest/get-local-data" request (route/restricted (get-local-data request)))