X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fpackage.lisp;h=8351ef3e147a2dd25c5d6da1aad02bbd983ab853;hp=5f8cc4e4b66e9139087fd37bb4ae5b34293621e0;hb=2961f4f122593e9d4875e88e6af159de28c8dd47;hpb=44cd3f817f6f59ffe495db4cf2b9ea4637a57f75

diff --git a/sql/package.lisp b/sql/package.lisp
index 5f8cc4e..8351ef3 100644
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -20,7 +20,7 @@
 ;;;; core packages.
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  #+sbcl
+ #+sbcl
   (if (find-package 'sb-mop)
       (pushnew :clsql-sbcl-mop cl:*features*)
       (pushnew :clsql-sbcl-pcl cl:*features*))
@@ -38,6 +38,7 @@
 	  #+clsql-sbcl-mop #:sb-mop
 	  #+clsql-cmucl-mop #:mop
 	  #+allegro #:mop
+	  #+clisp #:clos
 	  #+lispworks #:clos
 	  #+scl #:clos
 	  #+openmcl #:openmcl-mop)
@@ -45,6 +46,9 @@
     #+allegro
     (:shadowing-import-from 
      #:excl)
+    #+clisp
+    (:shadowing-import-from 
+     #:clos)
     #+lispworks
     (:shadowing-import-from 
      #:clos)
@@ -104,7 +108,6 @@
      #:check-connection-spec
      #:database-initialize-database-type
      #:database-type-load-foreign
-     #:database-name-from-spec
      #:database-connect
      #:database-disconnect
      #:database-query
@@ -129,7 +132,6 @@
      #:database-sequence-exists-p
      #:database-list-attributes
      #:database-attribute-type
-     #:database-describe-table
      #:database-type-library-loaded
      #:database-create
      #:database-destroy
@@ -181,7 +183,6 @@
      #:result-recording-stream
      #:record-caches
      #:view-classes
-     #:database-type
      #:database-state
      #:attribute-cache
      #:database-autocommit
@@ -204,7 +205,21 @@
      ;; Generic backends
      #:generic-postgresql-database
      #:generic-odbc-database
-     
+
+         ;; Subclasses of sql-expresssion (expressions.lisp) 
+         #:sql-function-exp
+         #:sql-value-exp 
+         #:sql-set-exp 
+         #:sql-query-modifier-exp 
+         #:sql-relational-exp 
+         #:sql-upcase-like 
+         #:sql-assignment-exp 
+         #:sql-typecast-exp 
+         #:sql-between-exp 
+         #:sql-ident 
+         #:sql-ident-attribute
+         #:sql-ident-table 
+
      .
 
      ;; Shared exports for re-export by CLSQL package. 
@@ -226,6 +241,12 @@
 	 #:sql-error
 	 #:sql-warning
 	 #:sql-database-warning
+         #:sql-error-database 
+         #:sql-error-database-type 
+         #:sql-error-connection-spec 
+         #:sql-error-expression 
+         #:sql-warning-database 
+         #:sql-user-error-message 
          #:*backend-warning-behavior*
 
          ;; Connection/initialisation (base-classes.lisp, database.lisp, 
@@ -244,6 +265,8 @@
          #:find-database               
          #:status                      
          ;; CLSQL Extensions 
+         #:database-name-from-spec
+         #:database-type 
          #:with-database
          #:with-default-database
          #:disconnect-pooled
@@ -251,7 +274,6 @@
          #:create-database
          #:destroy-database
          #:probe-database
-         #:truncate-database
 
          ;; I/O Recording (recording.lisp) 
          #:add-sql-stream             
@@ -261,9 +283,6 @@
          #:sql-stream			
          #:start-sql-recording		
          #:stop-sql-recording		
-         ;; CLSQL Extensions 
-         #:record-sql-command
-         #:record-sql-result
 
 	 ;; FDDL (fddl.lisp) 
 	 #:create-table                   
@@ -273,17 +292,15 @@
 	 #:list-attributes                
 	 #:attribute-type                 
 	 #:list-attribute-types		  
-	 #:*cache-table-queries-default*  
 	 #:create-view                    
 	 #:drop-view                      
 	 #:create-index                   
 	 #:drop-index                     
          ;; CLSQL Extensions 
-         #:describe-table
+         #:truncate-database
 	 #:list-views                  
 	 #:view-exists-p               
 	 #:list-indexes                
-	 #:list-table-indexes          
 	 #:index-exists-p              
 	 #:create-sequence             
 	 #:drop-sequence               
@@ -307,7 +324,6 @@
 	 #:map-query                    
 	 #:loop
          ;; CLSQL Extensions 
-         #:for-each-row
 	 #:prepare-sql
 	 #:bind-parameter
 	 #:run-prepared-sql
@@ -318,20 +334,13 @@
          #:commit                        
          #:rollback			 
          ;; CLSQL Extensions 
-         #:commit-transaction
-         #:rollback-transaction
          #:add-transaction-commit-hook
          #:add-transaction-rollback-hook
          #:start-transaction             
          #:in-transaction-p              
-         #:database-start-transaction
-         #:database-abort-transaction
-         #:database-commit-transaction
-         #:transaction-level
-         #:transaction
 	 #:set-autocommit
 
-	 ;;  OODDL (ooddl.lisp) 
+	 ;; OODDL (ooddl.lisp) 
 	 #:standard-db-object               
 	 #:def-view-class                   
 	 #:create-view-from-class           
@@ -342,12 +351,16 @@
 	 #:view-table        
 	 #:bigint
 	 #:varchar
-	 #:*default-varchar-length*
+	 #:generalized-boolean
+	 #:smallint
+	 #:tinyint
+	 #:*default-string-length*
 
 	 ;; OODML (oodml.lisp) 
 	 #:instance-refreshed               
 	 #:update-objects-joins             
 	 #:*default-update-objects-max-len* 
+	 #:*default-caching*
 	 #:update-slot-from-record          
 	 #:update-instance-from-records     
 	 #:update-records-from-instance     
@@ -356,7 +369,9 @@
 	 #:delete-instance-records          
 	 ;; CLSQL Extensions 
 	 #:*db-auto-sync*    
-
+	 #:write-instance-to-stream
+	 #:read-instance-from-stream
+	 
 	 ;; Symbolic SQL Syntax (syntax.lisp) 
 	 #:sql                              
 	 #:sql-expression                   
@@ -389,8 +404,8 @@
 	 #:sql-and
 	 #:sql-or
 	 #:sql-in
-	 #:sql-concat
          #:sql-substr 
+         #:sql-concat-op 
 	 #:sql-=
 	 #:sql-<
          #:sql->
@@ -407,7 +422,10 @@
          #:sql-distinct 
          #:sql-nvl 
          #:sql-slot-value
+         #:sql-userenv 
          ;; CLSQL Extensions 
+	 #:sql-concat
+         #:sql-substring 
          #:sql-limit 
 	 #:sql-group-by
 	 #:sql-having