Update auto_database_url.

ReilySiegel · Jan 31, 2019 · fe85f40 · fe85f40
1 parent 6bf4b29
commit fe85f40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -481,7 +481,7 @@ rollout 100%:
 .auto_devops: &auto_devops |
   # Auto DevOps variables and functions
   [[ "$TRACE" ]] && set -x
-  auto_database_url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${CI_ENVIRONMENT_SLUG}-postgres:5432/${POSTGRES_DB}
+  auto_database_url="jdbc:postgresql://${CI_ENVIRONMENT_SLUG}-postgres:5432/${POSTGRES_DB}?user=${POSTGRES_USER}&password=${POSTGRES_PASSWORD}&sslmode=disable"
   export DATABASE_URL=${DATABASE_URL-$auto_database_url}
   export CI_APPLICATION_REPOSITORY=$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG
   export CI_APPLICATION_TAG=$CI_COMMIT_SHA

diff --git a/src/clj/flexblock/db.clj b/src/clj/flexblock/db.clj
@@ -67,11 +67,7 @@
                        :admin    true})
         ;; Select the correct db-spec.
         db        (cond
-                    jdbc-url  {:connection-uri (str/replace-first
-                                                jdbc-url
-                                                #"postgres"
-                                                "jdbc:postgresql")
-                               :classname      "org.postgresql.Driver"}
+                    jdbc-url  {:connection-uri jdbc-url}
                     jdbc-spec jdbc-spec
                     :else     {:dbtype     "h2:mem"
                                :dbname     "flexblockdb"
@@ -89,10 +85,10 @@
     ;; Add the seed user, if they don't already exist.
     (when-not (db/exists? User :email (:email seed-user))
       (db/simple-insert! User
-        (-> seed-user
-            (assoc :passwordhash
-                   (h/derive (:password seed-user)))
-            (dissoc :password))))
+                         (-> seed-user
+                             (assoc :passwordhash
+                                    (h/derive (:password seed-user)))
+                             (dissoc :password))))
     db))
 
 (mount/defstate db