X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Foodml.lisp;h=ffcf02a518a46dfd69eda108ace0cb4bc22cb923;hb=925a29060928f773d4bc7d8e6bdd13c97e0ef65a;hp=99cf0217f31f7c8325a4cc890ae3d0df34606d51;hpb=0bed331173815bfe0544c0fdad6fb8b83ae929f1;p=clsql.git diff --git a/sql/oodml.lisp b/sql/oodml.lisp index 99cf021..ffcf02a 100644 --- a/sql/oodml.lisp +++ b/sql/oodml.lisp @@ -19,7 +19,7 @@ (flet ((qfk (k) (sql-operation '== (sql-expression :attribute - (view-class-slot-column k) + (database-identifier k database) :table tb) (db-value-from-slot k @@ -39,11 +39,11 @@ (defun generate-attribute-reference (vclass slotdef) (cond ((eq (view-class-slot-db-kind slotdef) :base) - (sql-expression :attribute (view-class-slot-column slotdef) - :table (view-table vclass))) + (sql-expression :attribute (database-identifier slotdef nil) + :table (database-identifier vclass nil))) ((eq (view-class-slot-db-kind slotdef) :key) - (sql-expression :attribute (view-class-slot-column slotdef) - :table (view-table vclass))) + (sql-expression :attribute (database-identifier slotdef nil) + :table (database-identifier vclass nil))) (t nil))) ;; @@ -196,7 +196,7 @@ (let* ((vct (view-table view-class)) (sd (slotdef-for-slot-with-class slot view-class))) (check-slot-type sd (slot-value obj slot)) - (let* ((att (view-class-slot-column sd)) + (let* ((att (database-identifier sd database)) (val (db-value-from-slot sd (slot-value obj slot) database))) (cond ((and vct sd (view-database obj)) (update-records (sql-expression :table vct) @@ -232,7 +232,7 @@ obj (slot-definition-name s)))) (check-slot-type s val) (list (sql-expression - :attribute (view-class-slot-column s)) + :attribute (database-identifier s database)) (db-value-from-slot s val database)))) sds))) (cond ((and avps (view-database obj)) @@ -263,17 +263,18 @@ (slot-value-list (slot) (let ((value (slot-value obj (slot-definition-name slot)))) (check-slot-type slot value) - (list (sql-expression :attribute (view-class-slot-column slot)) + (list (sql-expression :attribute (database-identifier slot database)) (db-value-from-slot slot value database))))) (let* ((view-class (or this-class (class-of obj))) (pk-slot (car (keyslots-for-class view-class))) + (pk-name (when pk-slot (slot-definition-name pk-slot))) (view-class-table (view-table view-class)) (pclass (car (class-direct-superclasses view-class)))) (when (normalizedp view-class) (setf pk (update-records-from-instance obj :database database :this-class pclass)) (when pk-slot - (setf (slot-value obj (slot-definition-name pk-slot)) pk))) + (setf (slot-value obj pk-name) pk))) (let* ((slots (remove-if-not #'slot-storedp (if (normalizedp view-class) (ordered-class-direct-slots view-class) @@ -297,37 +298,36 @@ :database database) (when pk-slot (setf pk (or pk - (slot-value obj (slot-definition-name pk-slot)))))) + (slot-value obj pk-name))))) (t (insert-records :into (sql-expression :table view-class-table) :av-pairs record-values :database database) - (when (and pk-slot (not pk)) - (setf pk (if (or (member :auto-increment (listify (view-class-slot-db-constraints pk-slot))) - (not (null (view-class-slot-autoincrement-sequence pk-slot)))) - (setf (slot-value obj (slot-definition-name pk-slot)) - (database-last-auto-increment-id database - view-class-table - pk-slot))))) + (setf pk + (when (auto-increment-column-p pk-slot database) + (setf (slot-value obj pk-name) + (database-last-auto-increment-id + database view-class-table pk-slot))))) (when pk-slot (setf pk (or pk - (slot-value - obj (slot-definition-name pk-slot))))) - (when (eql this-class nil) + (and (slot-boundp obj pk-name) + (slot-value obj pk-name))))) + (when (eql this-class nil) (setf (slot-value obj 'view-database) database))))))) ;; handle slots with defaults (let* ((view-class (or this-class (class-of obj))) (slots (if (normalizedp view-class) (ordered-class-direct-slots view-class) - (ordered-class-slots view-class)))) + (ordered-class-slots view-class)))) (dolist (slot slots) - (when (and (slot-exists-p slot 'db-constraints) - (listp (view-class-slot-db-constraints slot)) - (member :default (view-class-slot-db-constraints slot))) - (unless (and (slot-boundp obj (slot-definition-name slot)) - (slot-value obj (slot-definition-name slot))) - (update-slot-from-record obj (slot-definition-name slot)))))) + (let ((slot-name (slot-definition-name slot))) + (when (and (slot-exists-p slot 'db-constraints) + (listp (view-class-slot-db-constraints slot)) + (member :default (view-class-slot-db-constraints slot))) + (unless (and (slot-boundp obj slot-name) + (slot-value obj slot-name)) + (update-slot-from-record obj slot-name)))))) pk)) @@ -406,7 +406,7 @@ (sld (slotdef-for-slot-with-class slot class))) (if sld (if (eq value +no-slot-value+) - (sql-expression :attribute (view-class-slot-column sld) + (sql-expression :attribute (database-identifier sld database) :table (view-table class)) (db-value-from-slot sld @@ -941,8 +941,8 @@ maximum of MAX-LEN instances updated in each query." (symbol (sql-expression :attribute - (view-class-slot-column - (slotdef-for-slot-with-class fk sc)) + (database-identifier + (slotdef-for-slot-with-class fk sc) nil) :table (view-table sc))) (t fk)) (typecase hk @@ -989,8 +989,8 @@ maximum of MAX-LEN instances updated in each query." (symbol (sql-expression :attribute - (view-class-slot-column fksd) - :table (view-table jc))) + (database-identifier fksd nil) + :table (database-identifier jc nil))) (t fk)) (typecase hk (symbol @@ -1092,11 +1092,7 @@ maximum of MAX-LEN instances updated in each query." (declare (ignore all set-operation group-by having offset limit inner-join on)) (flet ((ref-equal (ref1 ref2) (string= (sql-output ref1 database) - (sql-output ref2 database))) - (tables-equal (table-a table-b) - (when (and table-a table-b) - (string= (string (slot-value table-a 'name)) - (string (slot-value table-b 'name)))))) + (sql-output ref2 database)))) (remf args :from) (remf args :where) (remf args :flatp) @@ -1126,7 +1122,7 @@ maximum of MAX-LEN instances updated in each query." jc-list)) immediate-join-classes) sel-tables) - :test #'tables-equal))) + :test #'database-identifier-equal))) (order-by-slots (mapcar #'(lambda (ob) (if (atom ob) ob (car ob))) (listify order-by))) (join-where nil))