use config class for storage setup (instead of prop list)

config.lisp

@@ -4,7 +4,7 @@
 
 (defpackage :scopes/config
   (:use :common-lisp)
-  (:export #:base #:root #:*root*
+  (:export #:base #:root #:*root* #:*current*
            #:env-data #:env-keys #:env-prefix #:env-path 
            #:actions #:add #:add-action #:children #:env-slots 
            #:name #:setup #:parent #:shutdown))

storage/storage.lisp

@@ -8,8 +8,8 @@
                     (:core :scopes/core)
                     (:alx :alexandria))
   (:export #:config 
-           #:storage #:setup
+           #:storage #:params #:setup
-           #:params #:qualified-table-name
+           #:qualified-table-name
            #:do-sql #:query #:drop-table
            #:normalize-keyword #:normalize-plist))
 
@@ -18,13 +18,10 @@
 ;;;; config
 
 (defclass config (config:base)
-  ((config:env-slots :initform '(db-name db-user db-password))
+  ((backend :reader backend :initarg :backend :initform :dbi)
-   (db-config :reader db-config :initarg :db-config)    ;to be replaced
+   (db-type :reader db-type :initarg :db-type :initform :sqlite3)
-   (backend)
+   (connect-args :reader connect-args :initarg :connect-args)
-   (db-type)
+   (options :reader options :initarg :options :initform nil)))
-   (connect-args)))
-
-;;;; db configurations
 
 (defvar *db-params*
   '(:sqlite3 (:id-type integer :json-type json :ts-sql identity)
@@ -43,9 +40,8 @@
    (schema :accessor schema)))
 
 (defun setup (cfg)
-  (let* ((conf (db-config cfg))
+  (let* ((db-type (db-type cfg))
-         (db-type (getf conf :db-type))
+         (conn-args (connect-args cfg))
-         (conn-args (getf conf :connect-args))
          (connect #'(lambda () 
                       (apply #'dbi:connect-cached db-type conn-args)))
          (st (make-instance 'storage 
@@ -54,7 +50,7 @@
          (ctx (make-instance 'context 
                              :config cfg :name (config:name cfg) :storage st)))
     (setf (conn st) (funcall connect))
-    (setf (schema st) (getf (getf conf :options) :schema))
+    (setf (schema st) (getf (options cfg) :schema))
     ctx))
 
 ;;;; database (SQL) interface
@@ -100,7 +96,5 @@
       (push v res)
       (push (normalize-keyword k) res))))
 
-;;;; backend-/driver-specific stuff
-
 (defun ts-string (ts)
   (format nil "~a" (local-time:universal-to-timestamp ts)))

test/config-postgres.lisp

@@ -3,19 +3,12 @@
 
 (in-package :scopes/test-storage)
 
-(defparameter db-config-postgres
+(defvar postgres-connect-args
-  '(:backend :dbi
+  '(:database-name "cltest" :host "localhost" :port 5432
-    :db-type :postgres
+    :username "testuser" :password "secret"))
-    :connect-args
-     (:database-name "cltest"
-	  :host "localhost"
-	  :port 5432
-	  :username "testuser"
-	  :password "secret")
-    :options
-	 (:schema "testing")))
 
-(config:root)
+(config:root :env-keys '(db-name db-user db-password))
 
 (config:add :storage :class 'storage:config :setup #'storage:setup
-            :db-config db-config-postgres)
+            :db-type :postgres
+            :connect-args postgres-connect-args)

test/config-sqlite.lisp

@@ -3,15 +3,11 @@
 
 (in-package :scopes/test-storage)
 
-(defparameter db-config-sqlite
+(defvar sqlite-connect-args
-  `(:backend :dbi
+  (list :database-name (namestring (scopes/testing:test-path "test.db" "data"))))
-    :db-type :sqlite3
-    :connect-args
-	 (:database-name 
-       ,(namestring (scopes/testing:test-path "test.db" "data")))
-    :options nil))
 
-(config:root)
+(config:root :env-keys '(db-name))
 
 (config:add :storage :class 'storage:config :setup #'storage:setup
-            :db-config db-config-sqlite)
+            :db-type :sqlite3
+            :connect-args sqlite-connect-args)

test/test-storage.lisp

@@ -9,8 +9,7 @@
                     (:storage :scopes/storage)
                     (:tracking :scopes/storage/tracking) 
                     (:t :scopes/testing))
-  (:export #:*db-config-test*
+  (:export #:run #:run-all #:run-postgres #:run-sqlite)
-           #:run #:run-all #:run-postgres #:run-sqlite)
   (:import-from :scopes/testing #:deftest #:==))
 
 (in-package :scopes/test-storage)
@@ -31,8 +30,7 @@
 
 (defun run ()
   (core:setup-services)
-  (let* ((ctx (core:find-service :storage))
+  (let ((ctx (core:find-service :storage)))
-         (cfg (core:config ctx)))
     (test-track ctx)
     (t:show-result)))