X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql%2Fpackage.lisp;h=7d8b8b23be461bef560b5d53035cee348cc83358;hb=3da1a0ba2b4ded66dca0bec9c4e23457eb7ff079;hp=3f8f49c271132ceab2d698363d532ab8829367c0;hpb=fa071351835a2c754895cb917db9c63303e7b5c1;p=clsql.git

diff --git a/sql/package.lisp b/sql/package.lisp
index 3f8f49c..7d8b8b2 100644
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -2,15 +2,15 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          package.cl
+;;;; Name:          package.lisp
 ;;;; 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.lisp,v 1.2 2002/10/21 07:45:50 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
 ;;;; and Copyright (c) 1999-2001 by Pierre R. Mai
 ;;;;
 ;;;; CLSQL users are granted the rights to distribute and use this software
@@ -18,17 +18,14 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
-
+(in-package #:cl-user)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (defpackage :clsql-sys
-    (:nicknames :clsql)
-    (:use :common-lisp :clsql-base-sys)
-    #+scl (:import-from :thread #:make-lock #:with-lock-held)
+  (defpackage #:clsql-sys
+    (:nicknames #:clsql)
+    (:use #:cl #:clsql-base-sys)
     (:import-from 
-     :clsql-base
+     #:clsql-base
      .
      #1=(
 	 #:clsql-condition
@@ -72,23 +69,56 @@
 	 #:closed-database
 	 #:database-name-from-spec
 	 
-	 ;; utils.cl
+	 ;; utils.lisp
 	 #:number-to-sql-string
 	 #:float-to-sql-string
 	 #:sql-escape-quotes
+
+	 ;; database.lisp -- Connection
+	 #:*default-database-type*	          ; clsql-base xx
+	 #:*default-database*	          ; classes    xx
+	 #:connect			          ; database   xx
+	 #:*connect-if-exists*	          ; database   xx
+	 #:connected-databases	          ; database   xx
+	 #:database		          ; database   xx
+	 #:database-name                     ; database   xx
+	 #:disconnect		          ; database   xx
+	 #:reconnect                         ; database
+	 #:find-database                     ; database   xx
+	 #:status                            ; database   xx
+	 #:with-database
+	 #:with-default-database
+
+	 ;; basic-sql.lisp
+	 #:query
+	 #:execute-command
+	 #:write-large-object
+	 #:read-large-object
+	 #:delete-large-object
+
+	 ;; Transactions
+	 #:with-transaction
+	 #:commit-transaction
+	 #:rollback-transaction
+	 #:add-transaction-commit-hook
+	 #:add-transaction-rollback-hook
+	 #:commit                            ; transact   xx
+	 #:rollback			  ; transact   xx
+	 #:with-transaction		  ; transact   xx		.
+	 #:start-transaction                 ; transact   xx
+	 #:in-transaction-p                  ; transact   xx
+	 #:database-start-transaction
+	 #:database-abort-transaction
+	 #:database-commit-transaction
+	 #:transaction-level
+	 #:transaction
+	 #:disconnect-pooled
 	 ))
     (:export
      ;; sql.cl
-     #:*connect-if-exists*
-     #:connected-databases
-     #:*default-database*
-     #:find-database
-     #:connect
-     #:disconnect
-     #:query
-     #:execute-command
      #:map-query
      #:do-query
+     #:for-each-row
      
      ;; functional.cl
      #:insert-records
@@ -96,32 +126,12 @@
      #: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#
      )