X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fpackage.lisp;h=242a0446d1022e2a6f4176ccd54789f05493c9cd;hp=2a07e84490d45d129494c42d06e171a088619529;hb=18e34efea688a6758b6e997401fbc3f241da98f3;hpb=e622ee6f4bf2b9fe81af59d566e651c983a4833b

diff --git a/sql/package.lisp b/sql/package.lisp
index 2a07e84..242a044 100644
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -5,6 +5,8 @@
 ;;;; Name:          package.lisp
 ;;;; Purpose:       Package definition for SQL interface
 ;;;;
+;;;; $Id$
+;;;; 
 ;;;; This file is part of CLSQL.
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -18,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*))
@@ -36,6 +38,7 @@
 	  #+clsql-sbcl-mop #:sb-mop
 	  #+clsql-cmucl-mop #:mop
 	  #+allegro #:mop
+	  #+clisp #:clos
 	  #+lispworks #:clos
 	  #+scl #:clos
 	  #+openmcl #:openmcl-mop)
@@ -43,6 +46,9 @@
     #+allegro
     (:shadowing-import-from 
      #:excl)
+    #+clisp
+    (:shadowing-import-from 
+     #:clos)
     #+lispworks
     (:shadowing-import-from 
      #:clos)
@@ -102,9 +108,9 @@
      #:check-connection-spec
      #:database-initialize-database-type
      #:database-type-load-foreign
-     #:database-name-from-spec
      #:database-connect
      #:database-disconnect
+     #:database-reconnect
      #:database-query
      #:database-execute-command
      #:database-create-sequence
@@ -127,7 +133,6 @@
      #:database-sequence-exists-p
      #:database-list-attributes
      #:database-attribute-type
-     #:database-describe-table
      #:database-type-library-loaded
      #:database-create
      #:database-destroy
@@ -138,6 +143,7 @@
      #:db-type-has-views?
      #:db-type-has-bigint?
      #:db-type-has-union?
+     #:db-type-has-prepared-stmt?
      #:db-type-has-subqueries?
      #:db-type-has-boolean-where?
      #:db-type-transaction-capable?
@@ -162,6 +168,12 @@
      #:read-large-object
      #:delete-large-object
 
+     ;; Prepared statments
+     #:database-prepare
+     #:database-run-prepared
+     #:database-bind-parameter
+     #:database-free-prepared
+
      ;; accessors for database class
      #:name
      #:connection-spec
@@ -172,10 +184,10 @@
      #:result-recording-stream
      #:record-caches
      #:view-classes
-     #:database-type
      #:database-state
      #:attribute-cache
-   
+     #:database-autocommit
+
      ;; utils.lisp
      #:without-interrupts
      #:make-process-lock
@@ -188,17 +200,36 @@
      #:number-to-sql-string
      #:float-to-sql-string
      #:sql-escape-quotes
+     #:sql-escape 
      #:in
 
      ;; 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. 
      #1=(
 
+         ;; foreign library loading
+         #:*foreign-library-search-paths*
+         #:push-library-path
+
 	 ;; Condition system (conditions.lisp) 
 	 #:sql-user-error
 	 #:sql-database-error
@@ -215,6 +246,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, 
@@ -233,6 +270,8 @@
          #:find-database               
          #:status                      
          ;; CLSQL Extensions 
+         #:database-name-from-spec
+         #:database-type 
          #:with-database
          #:with-default-database
          #:disconnect-pooled
@@ -240,7 +279,6 @@
          #:create-database
          #:destroy-database
          #:probe-database
-         #:truncate-database
 
          ;; I/O Recording (recording.lisp) 
          #:add-sql-stream             
@@ -250,9 +288,6 @@
          #:sql-stream			
          #:start-sql-recording		
          #:stop-sql-recording		
-         ;; CLSQL Extensions 
-         #:record-sql-command
-         #:record-sql-result
 
 	 ;; FDDL (fddl.lisp) 
 	 #:create-table                   
@@ -262,17 +297,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               
@@ -296,26 +329,23 @@
 	 #:map-query                    
 	 #:loop
          ;; CLSQL Extensions 
-         #:for-each-row
+	 #:prepare-sql
+	 #:bind-parameter
+	 #:run-prepared-sql
+	 #:free-prepared-sql
 
          ;; Transaction handling (transaction.lisp) 
          #:with-transaction
          #: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           
@@ -325,11 +355,18 @@
          ;; CLSQL Extensions 
 	 #:view-table        
 	 #:bigint
+	 #:varchar
+	 #:generalized-boolean
+	 #:mediumint
+	 #: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     
@@ -338,7 +375,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                   
@@ -371,8 +410,8 @@
 	 #:sql-and
 	 #:sql-or
 	 #:sql-in
-	 #:sql-concat
          #:sql-substr 
+         #:sql-concat-op 
 	 #:sql-=
 	 #:sql-<
          #:sql->
@@ -389,7 +428,10 @@
          #:sql-distinct 
          #:sql-nvl 
          #:sql-slot-value
+         #:sql-userenv 
          ;; CLSQL Extensions 
+	 #:sql-concat
+         #:sql-substring 
          #:sql-limit 
 	 #:sql-group-by
 	 #:sql-having