X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Ffdml.lisp;h=470ad37d195b7f2df46feea74ca724b2ee54f3a4;hp=283f2dd95e866738e8031c755fcd3ac91f16e875;hb=4788b3ac25bd649a7e034f4ee130183f37294acd;hpb=225c02af1ae1c9c6f0b6c29eaf8319d48caae89f diff --git a/sql/fdml.lisp b/sql/fdml.lisp index 283f2dd..470ad37 100644 --- a/sql/fdml.lisp +++ b/sql/fdml.lisp @@ -62,24 +62,6 @@ (list :flatp t)) (list :database database)))) -(defun truncate-database (&key (database *default-database*)) - (unless (typep database 'database) - (signal-no-database-error database)) - (unless (is-database-open database) - (database-reconnect database)) - (when (eq :oracle (database-type database)) - (ignore-errors (execute-command "PURGE RECYCLEBIN" :database database))) - (when (db-type-has-views? (database-underlying-type database)) - (dolist (view (list-views :database database)) - (drop-view view :database database))) - (dolist (table (list-tables :database database)) - (drop-table table :database database)) - (dolist (index (list-indexes :database database)) - (drop-index index :database database)) - (dolist (seq (list-sequences :database database)) - (drop-sequence seq :database database)) - (when (eq :oracle (database-type database)) - (ignore-errors (execute-command "PURGE RECYCLEBIN" :database database)))) (defun print-query (query-exp &key titles (formats t) (sizes t) (stream t) (database *default-database*)) @@ -195,12 +177,11 @@ the SQL expression WHERE in the table specified by TABLE in DATABASE which defaults to *DEFAULT-DATABASE*. There are three ways of specifying the values to update for each row. In the first, VALUES contains a list of values to use in the update and -ATTRIBUTES, AV-PAIRS and QUERY are nil. This can be used when -values are supplied for all attributes in TABLE. In the second, -ATTRIBUTES is a list of column names, VALUES is a corresponding -list of values and AV-PAIRS and QUERY are nil. In the third, -ATTRIBUTES, VALUES and QUERY are nil and AV-PAIRS is an alist -of (attribute value) pairs." +ATTRIBUTES and AV-PAIRS are nil. This can be used when values are +supplied for all attributes in TABLE. In the second, ATTRIBUTES +is a list of column names, VALUES is a corresponding list of +values and AV-PAIRS is nil. In the third, ATTRIBUTES and VALUES +are nil and AV-PAIRS is an alist of (attribute value) pairs." (when av-pairs (setf attributes (mapcar #'car av-pairs) values (mapcar #'cadr av-pairs))) @@ -211,8 +192,6 @@ of (attribute value) pairs." (execute-command stmt :database database))) -;; iteration - ;; output-sql (defmethod database-output-sql ((str string) database) @@ -221,7 +200,7 @@ of (attribute value) pairs." (type (simple-array * (*)) str)) (let ((len (length str))) (declare (type fixnum len)) - (cond ((= len 0) + (cond ((zerop len) +empty-string+) ((and (null (position #\' str)) (null (position #\\ str))) @@ -231,13 +210,14 @@ of (attribute value) pairs." (do* ((i 0 (incf i)) (j 1 (incf j))) ((= i len) (subseq buf 0 (1+ j))) - (declare (type integer i j)) + (declare (type fixnum i j)) (let ((char (aref str i))) - (cond ((eql char #\') - (setf (aref buf j) #\\) + (declare (character char)) + (cond ((char= char #\') + (setf (aref buf j) #\') (incf j) (setf (aref buf j) #\')) - ((eql char #\\) + ((char= char #\\) (setf (aref buf j) #\\) (incf j) (setf (aref buf j) #\\)) @@ -314,13 +294,6 @@ of (attribute value) pairs." (write-char #\) *sql-stream*))) t) -(defmethod describe-table ((table sql-create-table) - &key (database *default-database*)) - (database-describe-table - database - (convert-to-db-default-case - (symbol-name (slot-value table 'name)) database))) - #+nil (defmethod add-storage-class ((self database) (class symbol) &key (sequence t)) (let ((tablename (view-table (find-class class)))) @@ -329,8 +302,8 @@ of (attribute value) pairs." (when sequence (create-sequence-from-class class))))) -;;; Iteration +;;; Iteration (defmacro do-query (((&rest args) query-expression &key (database '*default-database*) (result-types :auto)) @@ -415,10 +388,8 @@ computed for each field." (database-query-result-set query-expression database :full-set nil :result-types result-types) (let ((flatp (and (= columns 1) - (typecase query-expression - (string t) - (sql-query - (slot-value query-expression 'flatp)))))) + (typep query-expression 'sql-query) + (slot-value query-expression 'flatp)))) (when result-set (unwind-protect (do ((row (make-list columns))) @@ -434,10 +405,8 @@ computed for each field." (database-query-result-set query-expression database :full-set nil :result-types result-types) (let ((flatp (and (= columns 1) - (typecase query-expression - (string t) - (sql-query - (slot-value query-expression 'flatp)))))) + (typep query-expression 'sql-query) + (slot-value query-expression 'flatp)))) (when result-set (unwind-protect (let ((result (list nil))) @@ -456,10 +425,8 @@ computed for each field." (database-query-result-set query-expression database :full-set t :result-types result-types) (let ((flatp (and (= columns 1) - (typecase query-expression - (string t) - (sql-query - (slot-value query-expression 'flatp)))))) + (typep query-expression 'sql-query) + (slot-value query-expression 'flatp)))) (when result-set (unwind-protect (if rows @@ -496,7 +463,8 @@ computed for each field." ;;; Row processing macro from CLSQL -(defmacro for-each-row (((&rest fields) &key from order-by where distinct limit) &body body) +(defmacro for-each-row (((&rest fields) &key from order-by where distinct limit) + &body body) (let ((d (gensym "DISTINCT-")) (bind-fields (loop for f in fields collect (car f))) (w (gensym "WHERE-")) @@ -583,3 +551,37 @@ computed for each field." (database-delete-large-object object-id database)) +;;; Prepared statements + +(defun prepare-sql (sql-stmt types &key (database *default-database*) (result-types :auto) field-names) + "Prepares a SQL statement for execution. TYPES contains a +list of types corresponding to the input parameters. Returns a +prepared-statement object. + +A type can be + :int + :double + :null + (:string n) +" + (unless (db-type-has-prepared-stmt? (database-type database)) + (error 'sql-user-error + :message + (format nil + "Database backend type ~:@(~A~) does not support prepared statements." + (database-type database)))) + + (database-prepare sql-stmt types database result-types field-names)) + +(defun bind-parameter (prepared-stmt position value) + "Sets the value of a parameter is in prepared statement." + (database-bind-parameter prepared-stmt position value) + value) + +(defun run-prepared-sql (prepared-stmt) + "Execute the prepared sql statment. All input parameters must be bound." + (database-run-prepared prepared-stmt)) + +(defun free-prepared-sql (prepared-stmt) + "Delete the objects associated with a prepared statement." + (database-free-prepared prepared-stmt))