r8821: integrate usql support

[clsql.git] / sql / package.lisp

diff --git a/sql/package.lisp b/sql/package.lisp
index dd3e5ddccad1295d63329e77cc1959fa45565f59..bb76d3e51e71d6f9a69a8d8757894b9843fc127f 100644 (file)
--- 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.1 2002/09/30 10:19:23 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,16 +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)
+  (defpackage #:clsql-sys
+    (:nicknames #:clsql)
+    (:use #:cl #:clsql-base-sys)
     (:import-from 
-     :clsql-base
+     #:clsql-base
      .
      #1=(
         #:clsql-condition
@@ -78,16 +76,9 @@
         ))
     (: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
@@ -95,32 +86,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#
      )