r8832: changes for allow import of clsql and clsql-usql in the same package

[clsql.git] / sql / package.lisp

diff --git a/sql/package.lisp b/sql/package.lisp
index bb76d3e51e71d6f9a69a8d8757894b9843fc127f..44eecaab01f300785be68adf48be2f6e1db14be5 100644 (file)
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -69,29 +69,70 @@
         #:closed-database
         #:database-name-from-spec
         
-        ;; utils.cl
+        ;; utils.lisp
         #:number-to-sql-string
         #:float-to-sql-string
         #:sql-escape-quotes
+
+        ;; database.lisp -- Connection
+        #:*default-database-type*                ; clsql-base xx
+        #:*default-database*             ; classes    xx
+        #:connect                                ; database   xx
+        #:*connect-if-exists*            ; database   xx
+        #:connected-databases            ; database   xx
+        #:database                       ; database   xx
+        #:database-name                     ; database   xx
+        #:disconnect                     ; database   xx
+        #:reconnect                         ; database
+        #:find-database                     ; database   xx
+        #:status                            ; database   xx
+        #:with-database
+        #:with-default-database
+
+        ;; basic-sql.lisp
+        #:query
+        #:execute-command
+        #:write-large-object
+        #:read-large-object
+        #:delete-large-object
+        #:do-query
+        #:map-query
+
+        ;; Transactions
+        #:with-transaction
+        #:commit-transaction
+        #:rollback-transaction
+        #:add-transaction-commit-hook
+        #:add-transaction-rollback-hook
+        #:commit                            ; transact   xx
+        #:rollback                       ; transact   xx
+        #:with-transaction               ; transact   xx               .
+        #:start-transaction                 ; transact   xx
+        #:in-transaction-p                  ; transact   xx
+        #:database-start-transaction
+        #:database-abort-transaction
+        #:database-commit-transaction
+        #:transaction-level
+        #:transaction
+        #:disconnect-pooled
         ))
     (:export
      ;; sql.cl
-     #:map-query
-     #:do-query
      #:for-each-row
      
-     ;; functional.cl
-     #:insert-records
-     #:delete-records
-     #:update-records
-     #:with-database
-     
      ;; Large objects (Marc B)
      #:create-large-object
      #:write-large-object
      #:read-large-object
      #:delete-large-object
 
+     ;; functional.lisp
+     ;; These are no longer export since different functions are
+     ;; exported by the CLSQL-USQL package
+     ;; #:insert-records
+     ;; #:delete-records
+     ;; #:update-records
+     
      .
      #1#
      )