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

[clsql.git] / sql / package.lisp

diff --git a/sql/package.lisp b/sql/package.lisp
index c9cce9ba8a53d83306bce108485ec13aad1bf5cf..5293df99f500c0c8ba11f0181082c0e3178f4e55 100644 (file)
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -30,7 +30,7 @@
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defpackage #:clsql-sys
-    (:use #:common-lisp #:clsql-base-sys
+    (:use #:common-lisp #:clsql-base
          #+clsql-sbcl-mop #:sb-mop
          #+clsql-cmucl-mop #:mop
          #+allegro #:mop
@@ -96,7 +96,7 @@
     )
    
    (:import-from 
-    #:clsql-base-sys
+    #:clsql-base
     .
     #1=(
        ;; conditions 
@@ -159,7 +159,6 @@
        ;; initialize
        #:*loaded-database-types*
        #:reload-database-types
-       #:*default-database-type*
        #:*initialized-database-types*
        #:initialize-database-type
        ;; classes
@@ -170,6 +169,7 @@
        #:database-view-classes
        #:conn-pool
        #:print-object 
+
        ;; utils
        #:sql-escape
 
@@ -311,7 +311,8 @@
        #:table-exists-p                    ; table      xx 
        #:list-attributes                   ; table      xx
        #:attribute-type                    ; table      xx
-       #:list-attribute-types              ; table      xx
+       #:list-attribute-types             ; table      xx
+       #:*cache-table-queries-default*
        #:create-view                       ; table      xx
        #:drop-view                         ; table      xx
        #:create-index                      ; table      xx             
@@ -326,7 +327,7 @@
        #:instance-refreshed                ; objects    xx 
        #:update-object-joins               ;
        #:*default-update-objects-max-len*  ; 
-       #:update-slot-from-record           ; objects    xx
+       #:update-slot-from-record          ; objects    xx
        #:update-instance-from-records      ; objects    xx
        #:update-records-from-instance      ; objects    xx
        #:update-record-from-slot           ; objects    xx