X-Git-Url: https://git.hcoop.net/clinton/lisp-on-lines.git/blobdiff_plain/4628b4334da3a1a67a6c38eabc11c4119af671ad..ec044146bf44d8b651c6da400bbb78694f5eb9a0:/src/backend/clsql.lisp diff --git a/src/backend/clsql.lisp b/src/backend/clsql.lisp index 6de317b..0083efc 100644 --- a/src/backend/clsql.lisp +++ b/src/backend/clsql.lisp @@ -9,8 +9,7 @@ (export 'list-base-classes) - -(defmethod sync-instance ((view clsql:standard-db-object) &key (fill-gaps-only nil) (database *default-database*)) +(defmethod sync-instance ((view clsql:standard-db-object) &key (fill-gaps-only-p nil) (database *default-database*)) (labels ((sym->sql (sym) (string-downcase (substitute #\_ #\- (string sym)))) (get-def (slot) (caar (query (format nil "SELECT DISTINCT adsrc from pg_attrdef join pg_attribute on attnum = adnum where adrelid = (select oid from pg_class where relname = '~A') and attname = '~A'" (sym->sql (class-name (class-of view))) (sym->sql slot))))) @@ -26,14 +25,17 @@ (setf (slot-value view slot) (get-default-value slot)) (when (and (primary-key-p view slot) (not (slot-value view slot)) - (not fill-gaps-only)) + (not fill-gaps-only-p)) (error "No default value for primary key : ~A" slot)))) - (when fill-gaps-only + (when fill-gaps-only-p (update-objects-joins (list view)) (return-from sync-instance)) (update-records-from-instance view :database database) (update-instance-from-records view :database database) - (update-objects-joins (list view)))) + (update-objects-joins (list view))) + + ;; return the modified and hopefully now persistent object + view) @@ -42,15 +44,15 @@ (defmethod list-base-classes ((type (eql :clsql))) *clsql-base-classes*) -(defmethod def-base-type-class-expander ((base-type (eql :clsql)) (model meta-model-class) (name t) (args t)) +(defmethod generate-base-class-definition ((base-type (eql :clsql)) (model meta-model-class) (name t) (args t)) `(def-view-class ,name () ,(meta-model.metadata model))) -(defmethod def-base-type-class-expander :after ((base-type (eql :clsql)) (model meta-model-class) (name t) (args t)) +(defmethod generate-base-class-definition :after ((base-type (eql :clsql)) (model meta-model-class) (name t) (args t)) (unless (member name *clsql-base-classes*) (setf *clsql-base-classes* (cons name *clsql-base-classes*)))) -(defparameter *sql-type-map* '((:INT4 integer) (:TEXT string) (:VARCHAR string) (:TIMESTAMP clsql-sys::wall-time) (:NUMERIC number)(:BYTEA string))) +(defparameter *sql-type-map* '((:INT4 integer) (:BOOL boolean) (:TEXT string) (:VARCHAR string) (:TIMESTAMP clsql-sys::wall-time) (:NUMERIC number)(:BYTEA string))) (defun gen-type (table column) (cadr (assoc @@ -209,13 +211,13 @@ AND fa.attnum = ANY (pg_constraint.confkey)")) :set t)) (defun gen-many-to-many (row home-key foreign-key) - (let ((name (sql->sym (string-upcase (format nil "~A->~A" (string (car row)) (string (second row))))))) + (let ((name (sql->sym (string-upcase (format nil "~A<-~A->~A" (string (car row)) (string foreign-key) (string (second row))))))) (setf row (mapcar #'sql->sym row)) `(,name :accessor ,name :db-kind :join :db-info (:join-class ,(car row) - :home-key ,home-key + :home-key ,home-key :foreign-key ,foreign-key :target-slot ,name :set t)))) @@ -239,41 +241,30 @@ AND fa.attnum = ANY (pg_constraint.confkey)")) "Create and instrument CLSQL view-class NAME and appropriate meta-model class its default name is %NAME-meta-model." - (let ((model-name (cond ((eq :model-name (car args)) - (pop args) ; remove keyword - (pop args)) ; get value - (t (intern (format nil "%~S-META-MODEL" name)))))) - - `(progn - (let* ((m (def-meta-model ,model-name ,supers ,slots ,args)) - (i (make-instance m))) - (setf (meta-model.base-type i) :clsql) - (prog1 (eval (def-base-class-expander i ',name ',args)) - (defmethod meta-model.metadata ((self ,name)) - (meta-model.metadata i))))))) + `(progn + (let* ((m (define-meta-model ,name ,supers ,slots ,args))) + (setf (meta-model.base-type m) :clsql) + (eval (generate-base-class-expander m ',name ',args))))) -(defmacro def-view-class/table (table &optional (name (sql->sym table)) model-name) +(defmacro def-view-class-from-table (table &optional + (name (clsql-pg-introspect::intern-normalize-for-lisp table))) "takes the name of a table as a string and creates a clsql view-class" - (let* ((pkey (cadr (assoc table (get-pkeys) :test #'equalp))) - (table-slots (table->slots table pkey name)) - (join-slots - (let ((slots nil)) - (dolist (exp (get-fkey-explosions)) - (when (equalp (car exp) (sql->sym table)) - (setf slots (cons (cdr exp) slots)))) - slots))) - `(def-view-class/meta ,name - () - ,(append table-slots join-slots) - ,@(when model-name (list :model-name model-name))))) + `(clsql-pg-introspect:gen-view-class ,table + :classname ,name + :generate-joins :all + :definer def-view-class/meta)) + + +(defmethod prepare-slot-name-for-select ((i standard-db-object) slot-name) + (clsql:sql-expression :attribute slot-name)) (def-compare-expr standard-db-object expr-= sql-=) (def-compare-expr standard-db-object expr-< sql-<) (def-compare-expr standard-db-object expr-> sql->) -(def-compare-expr standard-db-object expr-ends-with sql-like :value-format "%~A") -(def-compare-expr standard-db-object expr-starts-with sql-like :value-format "~A%") -(def-compare-expr standard-db-object expr-contains sql-like :value-format "%~A%") +(def-compare-expr standard-db-object expr-ends-with sql-uplike :value-format "%~A") +(def-compare-expr standard-db-object expr-starts-with sql-uplike :value-format "~A%") +(def-compare-expr standard-db-object expr-contains sql-uplike :value-format "%~A%") (def-logical-expr standard-db-object expr-and #'sql-and)