cco/cl-scopes
3
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity Actions

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

Browse source
This commit is contained in:
Helmut Merz 2024-05-06 19:01:55 +02:00
parent 5d7a4c0b82
commit 6938217533
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/storage.lisp
View file

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

9
test/etc.lisp
View file

@ -1,10 +1,11 @@
;;; cl-scopes/test/etc.lisp ;;; 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)) '(:db-type :sqlite3))
(defparameter db-params-postgres (defparameter db-config-postgres
'(:db-type :postgres)) '(:db-type :postgres))
(setf storage:*db-params* db-params-sqlite) (setf scopes/test-storage:*db-config-sqlite* db-config-sqlite)
(setf *db-params-postgres* db-params-postgres) (setf scopes/test-storage:*db-config-postgres* db-config-postgres)

13
test/test-storage.lisp
View file

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