rename db-params to db-config; provide both db-config vars in scopes/test-storage

storage/storage.lisp

@@ -4,13 +4,13 @@
 
 (defpackage :scopes/storage
   (:use :common-lisp)
-  (:export #:*db-params* 
+  (:export #:*db-config*
            #:storage
            #:drop-table))
 
 (in-package :scopes/storage)
 
-(defparameter *db-params* nil)
+(defparameter *db-config* nil)
 
 (defclass storage ()
   ((db :initarg :db)

test/etc.lisp

@@ -1,10 +1,11 @@
 ;;; cl-scopes/test/etc.lisp
+;;; use: `(load "test/etc")` from package scopes/test-storage
 
-(defparameter db-params-sqlite
+(defparameter db-config-sqlite
   '(:db-type :sqlite3))
 
-(defparameter db-params-postgres
+(defparameter db-config-postgres
   '(:db-type :postgres))
 
-(setf storage:*db-params* db-params-sqlite)
-(setf *db-params-postgres* db-params-postgres)
+(setf scopes/test-storage:*db-config-sqlite* db-config-sqlite)
+(setf scopes/test-storage:*db-config-postgres* db-config-postgres)

test/test-storage.lisp

@@ -7,15 +7,18 @@
   (:local-nicknames (:storage :scopes/storage)
                     (:tracking :scopes/storage/tracking) 
                     (:t :scopes/testing))
-  (:export #:run #:try))
+  (:export #:run #:try
+           #:*db-config-postgres* #:*db-config-sqlite*))
 
 (in-package :scopes/test-storage)
 
-(defparameter *db-params-postgres* nil)
+(defparameter *db-config-sqlite* nil)
+(defparameter *db-config-postgres* nil)
 (load "test/etc")
 (defun try()
-  (print storage:*db-params*)
-  (print *db-params-postgres*))
+  (setf storage:*db-config* *db-config-sqlite*)
+  (print storage:*db-config*)
+  (print *db-config-postgres*))
 
 (defun run ()
   (let ((st (make-instance 'storage:storage))
@@ -26,6 +29,6 @@
 (defun test-track (tst st)
   (let ((tr (make-instance 'tracking:track)))
     (storage:drop-table st :tracks)
-    (tracking:create-table st :tracks '(trackid username))
+    (tracking:create-table st :tracks '(taskid username))
     ;(setf (scs:data tr) nil)
     (t:assert-eq tst (tracking:data tr) nil)))