r9199: fold clsql-base and clsql-base-sys into clsql-base

[clsql.git] / classic / package.lisp

diff --git a/classic/package.lisp b/classic/package.lisp
index dd519278e261498126554b432bea988d4ed4520f..67891852373251ecae31dabadcb5cfc38116c62c 100644 (file)
--- a/classic/package.lisp
+++ b/classic/package.lisp
@@ -23,7 +23,7 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defpackage #:clsql-classic-sys
     (:nicknames #:clsql-classic)
-    (:use #:cl #:clsql-base-sys)
+    (:use #:cl #:clsql-base)
     (:import-from 
      #:clsql-base
      .
@@ -37,11 +37,12 @@
         #:clsql-invalid-spec-error-connection-spec
         #:clsql-invalid-spec-error-database-type
         #:clsql-invalid-spec-error-template
+        #:clsql-access-error
+        #:clsql-access-error-database-type
+        #:clsql-access-error-connection-spec
+        #:clsql-access-error-error
         #:clsql-connect-error
-        #:clsql-connect-error-database-type
-        #:clsql-connect-error-connection-spec
         #:clsql-connect-error-errno
-        #:clsql-connect-error-error
         #:clsql-sql-error
         #:clsql-sql-error-database
         #:clsql-sql-error-expression
@@ -66,7 +67,8 @@
         
         #:database
         #:database-name
-        #:closed-database
+        #:database-type
+        #:is-database-open
         #:database-name-from-spec
         
         ;; utils.lisp
@@ -88,6 +90,9 @@
         #:status                            ; database   xx
         #:with-database
         #:with-default-database
+        #:create-database
+        #:destroy-database
+        #:probe-database
 
         ;; basic-sql.lisp
         #:query