;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(in-package #:clsql-sys)
+(in-package #:clsql)
;;; Basic operations on databases
-
(defmethod database-query-result-set ((expr %sql-expression) database
&key full-set result-types)
(database-query-result-set (sql-output expr database) database
(defmethod query ((expr %sql-expression) &key (database *default-database*)
- (result-types nil) (flatp nil))
+ (result-types :auto) (flatp nil) (field-names t))
(query (sql-output expr database) :database database :flatp flatp
- :result-types result-types))
+ :result-types result-types :field-names field-names))
-(defun truncate-database (&key database)
+(defun truncate-database (&key (database *default-database*))
(unless (typep database 'database)
- (clsql-base-sys::signal-no-database-error database))
+ (clsql-base::signal-no-database-error database))
(unless (is-database-open database)
(database-reconnect database))
(when (db-type-has-views? (database-underlying-type database))
(let ((keyword-package (symbol-package :foo)))
(defmethod database-output-sql ((sym symbol) database)
- (declare (ignore database))
- (if (equal (symbol-package sym) keyword-package)
- (concatenate 'string "'" (string sym) "'")
- (symbol-name sym))))
+ (convert-to-db-default-case
+ (if (equal (symbol-package sym) keyword-package)
+ (concatenate 'string "'" (string sym) "'")
+ (symbol-name sym))
+ database)))
(defmethod database-output-sql ((tee (eql t)) database)
(declare (ignore database))
&key (database *default-database*))
(database-describe-table
database
- (convert-to-db-default-case (symbol-name (slot-value table 'name)) 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))