(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-))
'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)
- (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))))
()
()
- (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)
()
- (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-))
(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)
- (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))))
()
()
- (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 (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)
;;;;
;;;; Name: functional.lisp
;;;; Purpose: Functional interface
-;;;; Programmer: Pierre R. Mai
;;;;
;;;; Copyright (c) 1999-2001 Pierre R. Mai
;;;;
;;;;
;;;; 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
;;;; 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
(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
.
#1#
)
- (:documentation "This is the INTERNAL SQL-Interface package of CLSQL."))
+ (:documentation "This is the INTERNAL SQL-Interface package of CLSQL-CLASSIC."))
) ;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."))
;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-(in-package #:clsql-sys)
+(in-package #:clsql-classic-sys)
;;; Row processing macro
(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))
+
+
+++ /dev/null
-;;;; -*- 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))
-
-
: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")
- (: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)
: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
: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"))
- (: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))))
: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
(: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"))))))
: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
(: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)
: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
(: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"))))))
: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"))
- (: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"))))))
;;;; *************************************************************************
;;;; FILE IDENTIFICATION
;;;;
-;;;; Name: clsql-postgresql.asd
+;;;; Name: clsql-sqlite.asd
;;;; Purpose: ASDF file for CLSQL SQLite backend
;;;; Programmer: Aurelio Bignoli
;;;; Date Started: Aug 2003
;;;; 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)
: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
- ((: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"))))))
: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
(:file "test-fdml")
(:file "test-ooddl")
(:file "test-oodml")
- (:file "test-syntax"))))
- :depends-on (:clsql :rt))
+ (:file "test-syntax")))))
: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
;;;; *************************************************************************
;;;; 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
;;;; (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 ""