r9200: move large object support to base

[clsql.git] / base / basic-sql.lisp

diff --git a/base/basic-sql.lisp b/base/basic-sql.lisp
index 64fdb44038d4741eecb6b5c7ceb27e5768067e66..86f826755317b9ca1830ed4d1b96703f6d02417c 100644 (file)
--- a/base/basic-sql.lisp
+++ b/base/basic-sql.lisp
@@ -12,7 +12,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package #:clsql-base-sys)
+(in-package #:clsql-base)
 
 ;;; Query
 
@@ -30,16 +30,17 @@ one result per row. Returns a list of lists of values of the result of
 that expression and a list of field names selected in sql-exp."))
 
 (defmethod query ((query-expression string) &key (database *default-database*)
-                  (result-types nil) (flatp nil))
+                  (result-types :auto) (flatp nil) (field-names t))
   (record-sql-action query-expression :query database)
-  (let* ((res (database-query query-expression database result-types))
-         (res (if (and flatp (= (length
-                                 (slot-value query-expression 'selections))
-                                1))
-                  (mapcar #'car res)
-                  res)))
-    (record-sql-action res :result database)
-    res))
+  (multiple-value-bind (rows names) (database-query query-expression database result-types
+                                                    field-names)
+    (let ((result (if (and flatp (= 1 (length (car rows))))
+                      (mapcar #'car rows)
+                    rows)))
+      (record-sql-action result :result database)
+      (if field-names
+         (values result names)
+       result))))
 
 ;;; Execute
 
@@ -59,11 +60,6 @@ pair."))
     (record-sql-action res :result database))
   (values))
 
-
-(defun describe-table (table &key (database *default-database*))
-  "Return list of 2-element lists containing table name and type."
-  (database-describe-table database table))
-
 (defmacro do-query (((&rest args) query-expression
                     &key (database '*default-database*) (result-types nil))
                    &body body)
@@ -170,5 +166,21 @@ specified in output-type-spec and returned like in MAP."
                       (apply function row))))
        (database-dump-result-set result-set database)))))
 
+;;; Large objects support
+
+(defun create-large-object (&key (database *default-database*))
+  "Creates a new large object in the database and returns the object identifier"
+  (database-create-large-object database))
+
+(defun write-large-object (object-id data &key (database *default-database*))
+  "Writes data to the large object"
+  (database-write-large-object object-id data database))
+
+(defun read-large-object (object-id &key (database *default-database*))
+  "Reads the large object content"
+  (database-read-large-object object-id database))
 
+(defun delete-large-object (object-id &key (database *default-database*))
+  "Deletes the large object in the database"
+  (database-delete-large-object object-id database))