r9457: Reworked CLSQL file structure.

[clsql.git] / sql / db-interface.lisp

diff --git a/sql/db-interface.lisp b/sql/db-interface.lisp
index 64841728855094f6461f77a9c03a4d4ab4f5b805..939af1fa68ff89356e7f35bc4d8a56ca258348cf 100644 (file)
--- a/sql/db-interface.lisp
+++ b/sql/db-interface.lisp
@@ -85,7 +85,7 @@ implications, since many databases will require the query to be
 executed in full to answer this question.  If the query produced no
 results then nil is returned for all values that would have been
 returned otherwise.  If an error occurs during query execution, the
-function should signal a clsql-sql-error."))
+function should signal a sql-database-data-error."))
 
 (defgeneric database-dump-result-set (result-set database)
   (:method (result-set (database t))
@@ -158,42 +158,80 @@ if unable to destory."))
   (:documentation "Select the last value in sequence NAME in DATABASE."))
 
 (defgeneric database-start-transaction (database)
-  (:documentation "Start a transaction in DATABASE."))
+  (:documentation "Start a transaction in DATABASE.")
+  (:method ((database t))
+          (signal-no-database-error database)))
 
 (defgeneric database-commit-transaction (database)
-  (:documentation "Commit current transaction in DATABASE."))
+  (:documentation "Commit current transaction in DATABASE.")
+  (:method ((database t))
+          (signal-no-database-error database)))
 
 (defgeneric database-abort-transaction (database)
-  (:documentation "Abort current transaction in DATABASE."))
+  (:documentation "Abort current transaction in DATABASE.")
+  (:method ((database t))
+          (signal-no-database-error database)))
 
-(defgeneric database-get-type-specifier (type args database)
+(defgeneric database-get-type-specifier (type args database db-underlying-type)
   (:documentation "Return the type SQL type specifier as a string, for
 the given lisp type and parameters."))
 
 (defgeneric database-list-tables (database &key owner)
-  (:documentation "List all tables in the given database"))
+  (:documentation "List all tables in the given database")
+  (:method ((database t) &key owner)
+          (declare (ignore owner))
+          (signal-no-database-error database)))
+
+(defgeneric database-list-tables-and-sequences (database &key owner)
+  (:documentation "List all tables in the given database, may include seqeneces")
+  (:method ((database t) &key owner)
+          (declare (ignore owner))
+          (signal-no-database-error database))
+  (:method ((database database) &key owner)
+          (database-list-tables database :owner owner)))
  
 (defgeneric database-list-views (database &key owner)
-  (:documentation "List all views in the DATABASE."))
+  (:documentation "List all views in the DATABASE.")
+  (:method ((database t) &key owner)
+          (declare (ignore owner))
+          (signal-no-database-error database)))
 
 (defgeneric database-list-indexes (database &key owner)
-  (:documentation "List all indexes in the DATABASE."))
+  (:documentation "List all indexes in the DATABASE.")
+  (:method ((database t) &key owner)
+          (declare (ignore owner))
+          (signal-no-database-error database)))
 
 (defgeneric database-list-table-indexes (table database &key owner)
-  (:documentation "List all indexes for a table in the DATABASE."))
+  (:documentation "List all indexes for a table in the DATABASE.")
+  (:method (table (database t) &key owner) 
+          (declare (ignore table owner))
+          (signal-no-database-error database)))
 
 (defgeneric database-list-attributes (table database &key owner)
-  (:documentation "List all attributes in TABLE."))
+  (:documentation "List all attributes in TABLE.")
+  (:method (table (database t) &key owner)
+          (declare (ignore table owner))
+          (signal-no-database-error database)))
 
 (defgeneric database-attribute-type (attribute table database &key owner)
   (:documentation "Return the type of ATTRIBUTE in TABLE. Returns multiple values
-of TYPE_NAME (keyword) PRECISION SCALE NULLABLE."))
+of TYPE_NAME (keyword) PRECISION SCALE NULLABLE.")
+  (:method (attribute table (database t) &key owner)
+          (declare (ignore attribute table owner))
+          (signal-no-database-error database)))
 
 (defgeneric database-add-attribute (table attribute database)
-  (:documentation "Add the attribute to the table."))
+  (:documentation "Add the attribute to the table.")
+  (:method (table attribute (database t))
+          (declare (ignore table attribute))
+          (signal-no-database-error database)))
 
 (defgeneric database-rename-attribute (table oldatt newname database)
-  (:documentation "Rename the attribute in the table to NEWNAME."))
+  (:documentation "Rename the attribute in the table to NEWNAME.")
+  (:method (table oldatt newname (database t))
+          (declare (ignore table oldatt newname))
+          (signal-no-database-error database)))
 
 (defgeneric oid (object)
   (:documentation "Return the unique ID of a database object."))