moved command-object up into clsql

diff --git a/clsql-postgresql-socket3.asd b/clsql-postgresql-socket3.asd
index e3d2c9be7f57741f533d61f496f22182a883d31b..1455600e8cfecbb296ad1986612a799d3f5edf3a 100644 (file)
--- a/clsql-postgresql-socket3.asd
+++ b/clsql-postgresql-socket3.asd
@@ -33,7 +33,6 @@
   :components
   ((:module :db-postgresql-socket3
            :serial T
-           :components ((:file "command-object")
-                        (:file "package")
+           :components ((:file "package")
                         (:file "api")
                         (:file "sql")))))

diff --git a/clsql.asd b/clsql.asd
index 0c9c6546edbad44ce9bfc3244c226152c54d5dab..7d267623f5a1ea36d46080ac801bfb69efe9faff 100644 (file)
--- a/clsql.asd
+++ b/clsql.asd
@@ -88,7 +88,8 @@ oriented interface."
                        :pathname ""
                        :components ((:file "generic-postgresql")
                                     (:file "generic-odbc")
-                                    (:file "sequences"))
+                                    (:file "sequences")
+                                    (:file "command-object"))
                        :depends-on (functional))))))
 
 

diff --git a/db-postgresql-socket3/command-object.lisp b/db-postgresql-socket3/command-object.lisp
deleted file mode 100644 (file)
index 47dad33..0000000
--- a/db-postgresql-socket3/command-object.lisp
+++ /dev/null
@@ -1,37 +0,0 @@
-;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
-;;;; *************************************************************************
-;;;; FILE IDENTIFICATION
-;;;;
-;;;; Name:     postgresql-socket-sql.sql
-;;;; Purpose:  High-level PostgreSQL interface using socket
-;;;; Authors:  Russ Tyndall (at Acceleration.net) based on original code by
-;;;;           Kevin M. Rosenberg based on original code by Pierre R. Mai
-;;;; Created:  Sep 2009
-;;;;
-;;;;
-;;;; $Id$
-;;;;
-;;;; This file, part of CLSQL, is Copyright (c) 2002-2007 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
-;;;; 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)
-
-(defclass command-object ()
-  ((expression :accessor expression :initarg :expression :initform nil)
-   (parameters :accessor parameters :initarg :parameters :initform nil)
-   (prepared-name :accessor prepared-name :initarg :prepared-name :initform ""
-    :documentation "If we want this to be a prepared statement, give it a name
-       to identify it to this session")
-   (has-been-prepared :accessor has-been-prepared :initarg :has-been-prepared :initform nil
-                     :documentation "Have we already prepared this command object")
-   ))
-
-(export '(expression parameters prepared-name has-been-prepared command-object))
-
-

diff --git a/sql/command-object.lisp b/sql/command-object.lisp
new file mode 100644 (file)
index 0000000..47dad33
--- /dev/null
+++ b/sql/command-object.lisp
@@ -0,0 +1,37 @@
+;;;; -*- Mode: LISP; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; Name:     postgresql-socket-sql.sql
+;;;; Purpose:  High-level PostgreSQL interface using socket
+;;;; Authors:  Russ Tyndall (at Acceleration.net) based on original code by
+;;;;           Kevin M. Rosenberg based on original code by Pierre R. Mai
+;;;; Created:  Sep 2009
+;;;;
+;;;;
+;;;; $Id$
+;;;;
+;;;; This file, part of CLSQL, is Copyright (c) 2002-2007 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
+;;;; 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)
+
+(defclass command-object ()
+  ((expression :accessor expression :initarg :expression :initform nil)
+   (parameters :accessor parameters :initarg :parameters :initform nil)
+   (prepared-name :accessor prepared-name :initarg :prepared-name :initform ""
+    :documentation "If we want this to be a prepared statement, give it a name
+       to identify it to this session")
+   (has-been-prepared :accessor has-been-prepared :initarg :has-been-prepared :initform nil
+                     :documentation "Have we already prepared this command object")
+   ))
+
+(export '(expression parameters prepared-name has-been-prepared command-object))
+
+