r2913: *** empty log message ***

[clsql.git] / sql / package.cl

diff --git a/sql/package.cl b/sql/package.cl
index ec93e1e623a1c5ffdf7967005ffb50a74c76e48d..2bb0d8e1ab9b929d1493a77e4a2145fcec2507ea 100644 (file)
--- a/sql/package.cl
+++ b/sql/package.cl
@@ -3,12 +3,12 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; Name:          package.cl
-;;;; Purpose:       Package definition for high-level SQL interface
+;;;; Purpose:       Package definition for CLSQL (high-level) interface
 ;;;; Programmers:   Kevin M. Rosenberg based on
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: package.cl,v 1.14 2002/05/11 22:37:46 kevin Exp $
+;;;; $Id: package.cl,v 1.19 2002/09/17 17:16:43 kevin Exp $
 ;;;;
 ;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
@@ -21,48 +21,16 @@
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
 (in-package :cl-user)
 
-;;;; This file makes the required package definitions for CLSQL's
-;;;; core packages.
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-(defpackage :clsql-sys
-  (:use :common-lisp)
-  (:export
-     ;; "Private" exports for use by interface packages
-     #:check-connection-spec
-     #:database-type-load-foreign
-     #:database-type-library-loaded ;; KMR - Tests if foreign library okay
-     #:database-initialize-database-type
-     #:database-connect
-     #:database-disconnect
-     #:database-query
-     #:database-execute-command
-     #:database-query-result-set
-     #:database-dump-result-set
-     #:database-store-next-row
-     
-     ;; For UncommonSQL support
-     #:database-list-tables
-     #:database-list-attributes
-     #:database-attribute-type
-     #:database-create-sequence 
-     #:database-drop-sequence
-     #:database-sequence-next
-     #:sql-escape
-
-     ;; Support for pooled connections
-     #:database-type
-
-     ;; Large objects (Marc B)
-     #:database-create-large-object
-     #:database-write-large-object
-     #:database-read-large-object
-     #:database-delete-large-object
-     
-     ;; Shared exports for re-export by CLSQL
-
+  (defpackage :clsql-sys
+    (:nicknames :clsql)
+    (:use :common-lisp :clsql-base-sys)
+    (:import-from 
+     :clsql-base
      .
-     #1=(#:clsql-condition
+     #1=(
+        #:clsql-condition
         #:clsql-error
         #:clsql-simple-error
         #:clsql-warning
@@ -91,70 +59,75 @@
         #:clsql-exists-error
         #:clsql-closed-error
         #:clsql-closed-error-database
+        
         #:*loaded-database-types*
         #:reload-database-types
         #:*default-database-type*
         #:*initialized-database-types*
         #:initialize-database-type
-        #:*connect-if-exists*
-        #:*default-database*
-        #:connected-databases
+        
         #:database
         #:database-name
         #:closed-database
-        #:find-database
         #:database-name-from-spec
-        #:connect
-        #:disconnect
-        #:query
-        #:execute-command
-        #:map-query
-        #:do-query
-
-        ;; functional.cl
-        #:insert-records
-        #:delete-records
-        #:update-records
-        #:with-database
         
         ;; utils.cl
         #:number-to-sql-string
         #:float-to-sql-string
         #:sql-escape-quotes
-
-        ;; For UncommonSQL support
-        #:sql-ident
-        #:list-tables
-        #:list-attributes
-        #:attribute-type
-        #:create-sequence 
-        #:drop-sequence
-        #:sequence-next
-
-        ;; Pooled connections
-        #:disconnect-pooled
-
-        ;; Transactions
-        #:with-transaction
-        #:commit-transaction
-        #:rollback-transaction
-        #:add-transaction-commit-hook
-        #:add-transaction-rollback-hook
-
-        ;; Large objects (Marc B)
-        #:create-large-object
-        #:write-large-object
-        #:read-large-object
-        #:delete-large-object
         ))
+    (:export
+     ;; sql.cl
+     #:*connect-if-exists*
+     #:connected-databases
+     #:*default-database*
+     #:find-database
+     #:connect
+     #:disconnect
+     #:query
+     #:execute-command
+     #:map-query
+     #:do-query
+     
+     ;; functional.cl
+     #:insert-records
+     #:delete-records
+     #:update-records
+     #:with-database
+     
+     ;; For High-level UncommonSQL compatibility
+     #:sql-ident
+     #:list-tables
+     #:list-attributes
+     #:attribute-type
+     #:create-sequence 
+     #:drop-sequence
+     #:sequence-next
+     
+     ;; Pooled connections
+     #:disconnect-pooled
+     #:find-or-create-connection-pool
+     
+     ;; Transactions
+     #:with-transaction
+     #:commit-transaction
+     #:rollback-transaction
+     #:add-transaction-commit-hook
+     #:add-transaction-rollback-hook
+     
+     ;; Large objects (Marc B)
+     #:create-large-object
+     #:write-large-object
+     #:read-large-object
+     #:delete-large-object
+     
+     .
+     #1#
+     )
     (:documentation "This is the INTERNAL SQL-Interface package of CLSQL."))
-
-(defpackage #:clsql
-    (:import-from #:clsql-sys . #1#)
-    (:export . #1#)
-    (:documentation "This is the SQL-Interface package of CLSQL."))
-);eval-when
+  
+  )                                    ;eval-when
 
 (defpackage #:clsql-user
-    (:use #:common-lisp #:clsql)
-    (:documentation "This is the user package for experimenting with CLSQL."))
+  (:use #:common-lisp #:clsql)
+  (:documentation "This is the user package for experimenting with CLSQL."))