r8850: remove usql files

diff --git a/base/loop-extension.lisp b/base/loop-extension.lisp
index c3a2b9f2e930f37be93d1cce60f903d369321955..fa66079c821da6d0e77a318bbca8f7c155375044 100644 (file)
--- a/base/loop-extension.lisp
+++ b/base/loop-extension.lisp
@@ -41,7 +41,7 @@
     (unless in-phrase
       (ansi-loop::loop-error "Missing OF or IN iteration path."))
     (unless from-phrase
     (unless in-phrase
       (ansi-loop::loop-error "Missing OF or IN iteration path."))
     (unless from-phrase

-      (setq from-phrase '(*default-database*)))
+      (setq from-phrase '(clsql-base-sys:*default-database*)))

     (cond
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
     (cond
       ((consp variable)
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))


@@ -50,22 +50,22 @@
                              'loop-record-result-set-))
             (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
         (push `(when ,result-set-var
                              'loop-record-result-set-))
             (step-var (ansi-loop::loop-gentemp 'loop-record-step-)))
         (push `(when ,result-set-var

-                (database-dump-result-set ,result-set-var ,db-var))
+                (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))

               ansi-loop::*loop-epilogue*)
         `(((,variable nil ,data-type) (,query-var ,(first in-phrase))
            (,db-var ,(first from-phrase))
            (,result-set-var nil)
            (,step-var nil))
           ((multiple-value-bind (%rs %cols)
               ansi-loop::*loop-epilogue*)
         `(((,variable nil ,data-type) (,query-var ,(first in-phrase))
            (,db-var ,(first from-phrase))
            (,result-set-var nil)
            (,step-var nil))
           ((multiple-value-bind (%rs %cols)

-               (database-query-result-set ,query-var ,db-var)
+               (clsql-base-sys:database-query-result-set ,query-var ,db-var)

              (setq ,result-set-var %rs ,step-var (make-list %cols))))
           ()
           ()
              (setq ,result-set-var %rs ,step-var (make-list %cols))))
           ()
           ()

-          (not (database-store-next-row ,result-set-var ,db-var ,step-var))
+          (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var))

           (,variable ,step-var)
           (not ,result-set-var)
           ()
           (,variable ,step-var)
           (not ,result-set-var)
           ()

-          (not (database-store-next-row ,result-set-var ,db-var ,step-var))
+          (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,step-var))

           (,variable ,step-var))))
       (t
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))
           (,variable ,step-var))))
       (t
        (let ((query-var (ansi-loop::loop-gentemp 'loop-record-))


@@ -73,21 +73,21 @@
             (result-set-var (ansi-loop::loop-gentemp
                              'loop-record-result-set-)))
         (push `(when ,result-set-var
             (result-set-var (ansi-loop::loop-gentemp
                              'loop-record-result-set-)))
         (push `(when ,result-set-var

-                (database-dump-result-set ,result-set-var ,db-var))
+                (clsql-base-sys:database-dump-result-set ,result-set-var ,db-var))

               ansi-loop::*loop-epilogue*)
         `(((,variable nil ,data-type) (,query-var ,(first in-phrase))
            (,db-var ,(first from-phrase))
            (,result-set-var nil))
           ((multiple-value-bind (%rs %cols)
               ansi-loop::*loop-epilogue*)
         `(((,variable nil ,data-type) (,query-var ,(first in-phrase))
            (,db-var ,(first from-phrase))
            (,result-set-var nil))
           ((multiple-value-bind (%rs %cols)

-               (database-query-result-set ,query-var ,db-var)
+               (clsql-base-sys:database-query-result-set ,query-var ,db-var)

              (setq ,result-set-var %rs ,variable (make-list %cols))))
           ()
           ()
              (setq ,result-set-var %rs ,variable (make-list %cols))))
           ()
           ()

-          (not (database-store-next-row ,result-set-var ,db-var ,variable))
+          (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,variable))

           ()
           (not ,result-set-var)
           ()
           ()
           (not ,result-set-var)
           ()

-          (not (database-store-next-row ,result-set-var ,db-var ,variable))
+          (not (clsql-base-sys:database-store-next-row ,result-set-var ,db-var ,variable))

           ()))))))
 
 #+(or cmu scl)
           ()))))))
 
 #+(or cmu scl)

diff --git a/classic/functional.lisp b/classic/functional.lisp
index bf38a1219232716d18b90795eec91f89233a3bec..f13bcdcf01e7bded84bb105263369e6ade659d4a 100644 (file)
--- a/classic/functional.lisp
+++ b/classic/functional.lisp
@@ -4,7 +4,6 @@
 ;;;;
 ;;;; Name:          functional.lisp
 ;;;; Purpose:       Functional interface
 ;;;;
 ;;;; Name:          functional.lisp
 ;;;; Purpose:       Functional interface

-;;;; Programmer:    Pierre R. Mai

 ;;;;
 ;;;; Copyright (c) 1999-2001 Pierre R. Mai
 ;;;;
 ;;;;
 ;;;; Copyright (c) 1999-2001 Pierre R. Mai
 ;;;;


@@ -12,21 +11,12 @@
 ;;;;
 ;;;; This file is part of CLSQL. 
 ;;;;
 ;;;;
 ;;;; This file is part of CLSQL. 
 ;;;;

-;;;; CLSQL is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License (version 2) as
-;;;; published by the Free Software Foundation.
-;;;;
-;;;; CLSQL is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
-;;;;
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with CLSQL; if not, write to the Free Software Foundation, Inc.,
-;;;; 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+;;;; CLSQL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.

 ;;;; *************************************************************************
 
 ;;;; *************************************************************************
 

-(in-package #:clsql-sys)
+(in-package #:clsql-classic-sys)

 
 
 ;;; This file implements the more advanced functions of the
 
 
 ;;; This file implements the more advanced functions of the

diff --git a/classic/package.lisp b/classic/package.lisp
index 44eecaab01f300785be68adf48be2f6e1db14be5..c927415d3777dc507ddd6bcdc617de41b5db99a3 100644 (file)
--- a/classic/package.lisp
+++ b/classic/package.lisp
@@ -3,7 +3,7 @@
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; Name:          package.lisp
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; Name:          package.lisp

-;;;; Purpose:       Package definition for CLSQL (high-level) interface
+;;;; Purpose:       Package definition for CLSQL-CLASSIC high-level interface

 ;;;; Programmers:   Kevin M. Rosenberg based on
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002
 ;;;; Programmers:   Kevin M. Rosenberg based on
 ;;;;                Original code by Pierre R. Mai 
 ;;;; Date Started:  Feb 2002


@@ -21,8 +21,8 @@
 (in-package #:cl-user)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 (in-package #:cl-user)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (defpackage #:clsql-sys
-    (:nicknames #:clsql)
+  (defpackage #:clsql-classic-sys
+    (:nicknames #:clsql-classic)

     (:use #:cl #:clsql-base-sys)
     (:import-from 
      #:clsql-base
     (:use #:cl #:clsql-base-sys)
     (:import-from 
      #:clsql-base


@@ -136,10 +136,10 @@
      .
      #1#
      )
      .
      #1#
      )

-    (:documentation "This is the INTERNAL SQL-Interface package of CLSQL."))
+    (:documentation "This is the INTERNAL SQL-Interface package of CLSQL-CLASSIC."))

   
   )                                    ;eval-when
 
   
   )                                    ;eval-when
 

-(defpackage #:clsql-user
-  (:use #:common-lisp #:clsql)
-  (:documentation "This is the user package for experimenting with CLSQL."))
+(defpackage #:clsql-classic-user
+  (:use #:common-lisp #:clsql-classic)
+  (:documentation "This is the user package for experimenting with CLSQL-CLASSIC."))

diff --git a/classic/sql.lisp b/classic/sql.lisp
index c207a8f52221b11de881e0fe543a98e68b025742..d1d971555854c772d9ab9eec667db43fdf3d0f8b 100644 (file)
--- a/classic/sql.lisp
+++ b/classic/sql.lisp
@@ -17,7 +17,7 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 

-(in-package #:clsql-sys)
+(in-package #:clsql-classic-sys)

 
 
 ;;; Row processing macro
 
 
 ;;; Row processing macro


@@ -109,3 +109,36 @@
   (database-delete-large-object object-id database))
 
 
   (database-delete-large-object object-id database))
 
 

+;;; These functions are not exported. If you application depends on these
+;;; functions consider using the clsql package using has further support.
+
+(defun list-tables (&key (database *default-database*))
+  "List all tables in *default-database*, or if the :database keyword arg
+is given, the specified database.  If the keyword arg :system-tables
+is true, then it will not filter out non-user tables.  Table names are
+given back as a list of strings."
+  (database-list-tables database))
+
+
+(defun list-attributes (table &key (database *default-database*))
+  "List the attributes of TABLE in *default-database, or if the
+:database keyword is given, the specified database.  Attributes are
+returned as a list of strings."
+  (database-list-attributes table database))
+
+(defun attribute-type (attribute table &key (database *default-database*))
+  "Return the field type of the ATTRIBUTE in TABLE.  The optional
+keyword argument :database specifies the database to query, defaulting
+to *default-database*."
+  (database-attribute-type attribute table database))
+
+(defun create-sequence (name &key (database *default-database*))
+  (database-create-sequence name database))
+
+(defun drop-sequence (name &key (database *default-database*))
+  (database-drop-sequence name database))
+
+(defun sequence-next (name &key (database *default-database*))
+  (database-sequence-next name database))
+
+

diff --git a/classic/usql.lisp b/classic/usql.lisp
deleted file mode 100644 (file)
index 1acd88a..0000000
--- a/classic/usql.lisp
+++ /dev/null
@@ -1,58 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:          usql.lisp
-;;;; Purpose:       High-level interface to SQL driver routines needed for
-;;;;                UncommonSQL
-;;;; Programmers:   Kevin M. Rosenberg and onShore Development Inc
-;;;; Date Started:  Mar 2002
-;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg
-;;;; and onShore Development Inc
-;;;;
-;;;; CLSQL users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-;;;; *************************************************************************
-
-
-;;; Minimal high-level routines to enable low-level interface for USQL
-;;; Thse functions are not exported. If you application depends on these
-;;; consider using the clsql-usql package.
-
-
-(in-package #:clsql-sys)
-
-(defun list-tables (&key (database *default-database*))
-  "List all tables in *default-database*, or if the :database keyword arg
-is given, the specified database.  If the keyword arg :system-tables
-is true, then it will not filter out non-user tables.  Table names are
-given back as a list of strings."
-  (database-list-tables database))
-
-
-(defun list-attributes (table &key (database *default-database*))
-  "List the attributes of TABLE in *default-database, or if the
-:database keyword is given, the specified database.  Attributes are
-returned as a list of strings."
-  (database-list-attributes table database))
-
-(defun attribute-type (attribute table &key (database *default-database*))
-  "Return the field type of the ATTRIBUTE in TABLE.  The optional
-keyword argument :database specifies the database to query, defaulting
-to *default-database*."
-  (database-attribute-type attribute table database))
-
-(defun create-sequence (name &key (database *default-database*))
-  (database-create-sequence name database))
-
-(defun drop-sequence (name &key (database *default-database*))
-  (database-drop-sequence name database))
-
-(defun sequence-next (name &key (database *default-database*))
-  (database-sequence-next name database))
-
-

diff --git a/clsql-aodbc.asd b/clsql-aodbc.asd
index 8372ccce42a45a5324f4e8fe9fa2a302c003259f..76c8bdd3e8d713a7703cfb2b22e51c3712104efc 100644 (file)
--- a/clsql-aodbc.asd
+++ b/clsql-aodbc.asd
@@ -28,12 +28,12 @@
   :description "Common Lisp SQL AODBC Driver"
   :long-description "cl-sql-aodbc package provides a database driver to AllegroCL's AODBC database interface."
 
   :description "Common Lisp SQL AODBC Driver"
   :long-description "cl-sql-aodbc package provides a database driver to AllegroCL's AODBC database interface."
 

+  :depends-on (clsql-base)

   :components
     ((:module :db-aodbc
              :components
              ((:file "aodbc-package")
   :components
     ((:module :db-aodbc
              :components
              ((:file "aodbc-package")

-              (:file "aodbc-sql" :depends-on ("aodbc-package")))))
-    :depends-on (:clsql-base))
+              (:file "aodbc-sql" :depends-on ("aodbc-package"))))))

 
 #-(and allegro (not allegro-cl-trial))
 (defsystem clsql-aodbc)
 
 #-(and allegro (not allegro-cl-trial))
 (defsystem clsql-aodbc)

diff --git a/clsql-classic-tests.asd b/clsql-classic-tests.asd
index 5b96d2a68a98fe8f9982f5a08abb748c19bb8e1b..74f2dfbc36dcfd9eda0539ea263aa388734e6f67 100644 (file)
--- a/clsql-classic-tests.asd
+++ b/clsql-classic-tests.asd
@@ -21,12 +21,12 @@
   :licence "Lessor Lisp General Public License"
   :description "Testing suite for CLSQL"
 
   :licence "Lessor Lisp General Public License"
   :description "Testing suite for CLSQL"
 

-  :depends-on (:clsql #-clisp :clsql-mysql 
-                     #-clisp :clsql-postgresql
-                     #-clisp :clsql-postgresql-socket
-                     :ptester
-                     #+(and allegro (not allegro-cl-trial)) :clsql-aodbc
-                     :clsql-sqlite)
+  :depends-on (clsql #-clisp clsql-mysql 
+                    #-clisp clsql-postgresql
+                    #-clisp clsql-postgresql-socket
+                    ptester
+                    #+(and allegro (not allegro-cl-trial)) clsql-aodbc
+                    clsql-sqlite)

   :components
   ((:module :classic-tests
            :components
   :components
   ((:module :classic-tests
            :components

diff --git a/clsql-classic.asd b/clsql-classic.asd
index 75cffe219efb5deedba9a2c6fc25350be84b71a1..d10438812966b761504e5ab0a9d27e7afd385484 100644 (file)
--- a/clsql-classic.asd
+++ b/clsql-classic.asd
@@ -29,16 +29,13 @@
   :description "Common Lisp SQL Interface Library"
   :long-description "cl-sql package provides the high-level interface for the CLSQL system."
   
   :description "Common Lisp SQL Interface Library"
   :long-description "cl-sql package provides the high-level interface for the CLSQL system."
   

+  :depends-on (clsql-base)

   :components
   ((:module :classic
            :components
            ((:file "package")
             (:file "sql" :depends-on ("package"))
   :components
   ((:module :classic
            :components
            ((:file "package")
             (:file "sql" :depends-on ("package"))

-            (:file "functional" :depends-on ("sql"))
-            (:file "usql" :depends-on ("sql"))
-            )))
-  :depends-on (:clsql-base)
-  )
+            (:file "functional" :depends-on ("sql"))))))

 
 #+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defmethod perform ((o test-op) (c (eql (find-system :clsql-classic))))
 
 #+(or allegro lispworks cmu sbcl openmcl mcl scl)
 (defmethod perform ((o test-op) (c (eql (find-system :clsql-classic))))

diff --git a/clsql-mysql.asd b/clsql-mysql.asd
index 88abbada6ba7a286333695c5720cb3c2ab360e83..9cb9739f6cf69c5610791f3491673d28fa88e75a 100644 (file)
--- a/clsql-mysql.asd
+++ b/clsql-mysql.asd
@@ -75,6 +75,7 @@
   :description "Common Lisp SQL MySQL Driver"
   :long-description "cl-sql-mysql package provides a database driver to the MySQL database system."
 
   :description "Common Lisp SQL MySQL Driver"
   :long-description "cl-sql-mysql package provides a database driver to the MySQL database system."
 

+  :depends-on (uffi clsql-base clsql-uffi)

   :components
   ((:module :db-mysql
            :components
   :components
   ((:module :db-mysql
            :components


@@ -83,6 +84,4 @@
             (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
             (:file "mysql-client-info" :depends-on ("mysql-loader"))
             (:file "mysql-api" :depends-on ("mysql-client-info"))
             (:file "mysql-loader" :depends-on ("mysql-package" "mysql"))
             (:file "mysql-client-info" :depends-on ("mysql-loader"))
             (:file "mysql-api" :depends-on ("mysql-client-info"))

-            (:file "mysql-sql" :depends-on ("mysql-api"))
-            (:file "mysql-usql" :depends-on ("mysql-sql")))))
-  :depends-on (:uffi :clsql-base :clsql-uffi))
+            (:file "mysql-sql" :depends-on ("mysql-api"))))))

diff --git a/clsql-oracle.asd b/clsql-oracle.asd
index 92b7059fad79da69fcbfbd7055824b4ca0b6e9cf..b03beb49d8e643c64917ba1981b1aed0030332a9 100644 (file)
--- a/clsql-oracle.asd
+++ b/clsql-oracle.asd
@@ -17,6 +17,7 @@
   :description "Common Lisp SQL Oracle Driver"
   :long-description "cl-sql-oracle package provides a database driver to the Oracle database system."
 
   :description "Common Lisp SQL Oracle Driver"
   :long-description "cl-sql-oracle package provides a database driver to the Oracle database system."
 

+  :depends-on (clsql-base)

   :components
     ((:module :db-oracle
              :components
   :components
     ((:module :db-oracle
              :components


@@ -26,8 +27,7 @@
               (:file "oracle-constants" :depends-on ("oracle-package"))
               (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
               (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))
               (:file "oracle-constants" :depends-on ("oracle-package"))
               (:file "oracle" :depends-on ("oracle-constants" "oracle-loader"))
               (:file "oracle-sql" :depends-on ("oracle" "alien-resources"))

-              (:file "oracle-objects" :depends-on ("oracle-sql")))))
-    :depends-on (:clsql-base))
+              (:file "oracle-objects" :depends-on ("oracle-sql"))))))

 
 #-cmu
 (defsystem clsql-oracle)
 
 #-cmu
 (defsystem clsql-oracle)

diff --git a/clsql-postgresql-socket.asd b/clsql-postgresql-socket.asd
index 76825b8ba2717b3a743fd4fb44598fc6c9e4e0bf..a990fe12e1cc026e32dbac00dc7157480f702450 100644 (file)
--- a/clsql-postgresql-socket.asd
+++ b/clsql-postgresql-socket.asd
@@ -30,6 +30,7 @@
   :description "Common Lisp SQL PostgreSQL Socket Driver"
   :long-description "cl-sql-postgresql-socket package provides a database driver to the PostgreSQL database via a socket interface."
 
   :description "Common Lisp SQL PostgreSQL Socket Driver"
   :long-description "cl-sql-postgresql-socket package provides a database driver to the PostgreSQL database via a socket interface."
 

+  :depends-on (clsql-base uffi md5)

   :components
   ((:module :db-postgresql-socket
            :components
   :components
   ((:module :db-postgresql-socket
            :components


@@ -37,7 +38,4 @@
             (:file "postgresql-socket-api"
                    :depends-on ("postgresql-socket-package"))
             (:file "postgresql-socket-sql"
             (:file "postgresql-socket-api"
                    :depends-on ("postgresql-socket-package"))
             (:file "postgresql-socket-sql"

-                   :depends-on ("postgresql-socket-api"))
-             (:file "postgresql-socket-usql"
-                   :depends-on ("postgresql-socket-sql")))))
-  :depends-on (:clsql-base :uffi :md5))
+                   :depends-on ("postgresql-socket-api"))))))

diff --git a/clsql-postgresql.asd b/clsql-postgresql.asd
index 0fdd54ca6c761e28afcc4d0d94650b61b1f48314..459a04b6cc5d82c993a6f56abe73356a00753d43 100644 (file)
--- a/clsql-postgresql.asd
+++ b/clsql-postgresql.asd
@@ -30,12 +30,11 @@
   :description "Common Lisp PostgreSQL API Driver"
   :long-description "cl-sql-postgresql package provides a the database driver for the PostgreSQL API."
 
   :description "Common Lisp PostgreSQL API Driver"
   :long-description "cl-sql-postgresql package provides a the database driver for the PostgreSQL API."
 

+  :depends-on (uffi clsql-base clsql-uffi)

   :components
   ((:module :db-postgresql
            :components
            ((:file "postgresql-package")
             (:file "postgresql-loader" :depends-on ("postgresql-package"))
             (:file "postgresql-api" :depends-on ("postgresql-loader"))
   :components
   ((:module :db-postgresql
            :components
            ((:file "postgresql-package")
             (:file "postgresql-loader" :depends-on ("postgresql-package"))
             (:file "postgresql-api" :depends-on ("postgresql-loader"))

-            (:file "postgresql-sql" :depends-on ("postgresql-api"))
-            (:file "postgresql-usql" :depends-on ("postgresql-sql")))))
-  :depends-on (:uffi :clsql-base :clsql-uffi))
+            (:file "postgresql-sql" :depends-on ("postgresql-api"))))))

diff --git a/clsql-sqlite.asd b/clsql-sqlite.asd
index c3840fb47af031c4e3998bd27a23ea4a6d96b5c4..1038f9bdd7497a938029484cab788290dd59b5c7 100644 (file)
--- a/clsql-sqlite.asd
+++ b/clsql-sqlite.asd
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;

-;;;; Name:          clsql-postgresql.asd
+;;;; Name:          clsql-sqlite.asd

 ;;;; Purpose:       ASDF file for CLSQL SQLite backend
 ;;;; Programmer:    Aurelio Bignoli
 ;;;; Date Started:  Aug 2003
 ;;;; Purpose:       ASDF file for CLSQL SQLite backend
 ;;;; Programmer:    Aurelio Bignoli
 ;;;; Date Started:  Aug 2003


@@ -15,6 +15,7 @@
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 ;;;; as governed by the terms of the Lisp Lesser GNU Public License
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************

+

 (defpackage #:clsql-sqlite-system (:use #:asdf #:cl))
 (in-package #:clsql-sqlite-system)
 
 (defpackage #:clsql-sqlite-system (:use #:asdf #:cl))
 (in-package #:clsql-sqlite-system)
 


@@ -26,16 +27,15 @@
   :description "Common Lisp SQLite Driver"
   :long-description "cl-sql-sqlite package provides a database driver to SQLite database library."
 
   :description "Common Lisp SQLite Driver"
   :long-description "cl-sql-sqlite package provides a database driver to SQLite database library."
 

+
+  :depends-on (#-clisp uffi clsql-base)

   :components
   :components

-    ((:module :db-sqlite
-             :components
-             ((:file "sqlite-package")
-              (:file "sqlite-loader" :depends-on ("sqlite-package"))
-              (:file #+clisp "sqlite-api-clisp"
-                     #-clisp "sqlite-api-uffi"
-                      :depends-on ("sqlite-loader"))
-              (:file "sqlite-sql" :depends-on (#+clisp "sqlite-api-clisp"
-                                               #-clisp "sqlite-api-uffi"))
-              (:file "sqlite-usql" :depends-on ("sqlite-sql")))))
-    :depends-on (#-clisp :uffi
-                        :clsql-base))
+  ((:module :db-sqlite
+           :components
+           ((:file "sqlite-package")
+            (:file "sqlite-loader" :depends-on ("sqlite-package"))
+            (:file #+clisp "sqlite-api-clisp"
+                   #-clisp "sqlite-api-uffi"
+                   :depends-on ("sqlite-loader"))
+            (:file "sqlite-sql" :depends-on (#+clisp "sqlite-api-clisp"
+                                                     #-clisp "sqlite-api-uffi"))))))

diff --git a/clsql-tests.asd b/clsql-tests.asd
index a9486ac3eeebacb6646de9e327ae262e96f4770a..afceb8c726a18ea03fafbdacd531ba19a458a83a 100644 (file)
--- a/clsql-tests.asd
+++ b/clsql-tests.asd
@@ -23,7 +23,8 @@
     :maintainer ""
     :version ""
     :licence ""
     :maintainer ""
     :version ""
     :licence ""

-    :description "A regression test suite for CLSQL-USQL."
+    :description "A regression test suite for CLSQL."
+    :depends-on (clsql rt)

     :components 
     ((:module tests
              :serial t
     :components 
     ((:module tests
              :serial t


@@ -34,5 +35,4 @@
                           (:file "test-fdml")
                           (:file "test-ooddl")
                           (:file "test-oodml")
                           (:file "test-fdml")
                           (:file "test-ooddl")
                           (:file "test-oodml")

-                          (:file "test-syntax"))))
-    :depends-on (:clsql :rt))
+                          (:file "test-syntax")))))

diff --git a/clsql-uffi.asd b/clsql-uffi.asd
index 077b578fe55ce6d41312fb1685ca583ce3392c1a..93bcb73e300fb0266b7d4619ab8465aa34d5574c 100644 (file)
--- a/clsql-uffi.asd
+++ b/clsql-uffi.asd
@@ -79,7 +79,7 @@
   :description "Common UFFI Helper functions for Common Lisp SQL Interface Library"
   :long-description "cl-sql-uffi package provides common helper functions using the UFFI for the CLSQL package."
 
   :description "Common UFFI Helper functions for Common Lisp SQL Interface Library"
   :long-description "cl-sql-uffi package provides common helper functions using the UFFI for the CLSQL package."
 

-  :depends-on (:uffi :clsql-base)
+  :depends-on (uffi clsql-base)

   
   :components
   ((:module :uffi
   
   :components
   ((:module :uffi

diff --git a/clsql.asd b/clsql.asd
index cebcee1a1177e220870768d8372ad0433d13d752..c880e68fb98f0cc881a2ead0c969ac3544c8d951 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -2,7 +2,7 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;

-;;;; Name:     clsql-classic.asd
+;;;; Name:     clsql.asd

 ;;;; Purpose:  System definition for CLSQL-CLASSIC
 ;;;; Authors:  Marcus Pearce and Kevin M. Rosenberg
 ;;;; Created:  March 2004
 ;;;; Purpose:  System definition for CLSQL-CLASSIC
 ;;;; Authors:  Marcus Pearce and Kevin M. Rosenberg
 ;;;; Created:  March 2004


@@ -14,8 +14,8 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 

-(asdf:defsystem #:clsql-usql
-    :name "CLSQL-USQL"
+(asdf:defsystem #:clsql
+    :name "CLSQL"

     :author ""
     :maintainer ""
     :version ""
     :author ""
     :maintainer ""
     :version ""