r9051: db-type to db-kind

diff --git a/ChangeLog b/ChangeLog
index 1fa9602632fe896fddd55bf17cd501101db08924..faa66e6cd991dfe2faacdf1289b63d87cbf8a0a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-16 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+18 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
+       * Version 2.7.7
+       * doc/csql.xml, examples/clsql-tutorial.lisp: Patch for db-kind
+       from Eduardo Munoz.
+       
+17 Apr 2004 Kevin Rosenberg (kevin@rosenberg.net)
        * Version 2.7.6
        * base/objects.lisp, base/classes.lisp: Patch
        for db-kind from Eduardo Munoz

diff --git a/debian/changelog b/debian/changelog
index 284e3f0cdcb53d67d5ed0d65c4033b398a55c08a..ed1deee79f4b6605b1bd93a2ee260ce6c5a44a76 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-sql (2.7.7-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 18 Apr 2004 10:17:09 -0600
+
 cl-sql (2.7.6-1) unstable; urgency=low
 
   * New upstream

diff --git a/doc/csql.xml b/doc/csql.xml
index d0d09fa4c76caaa7efab2ccecd36dd4d1a59eac1..47491ffe4fa44857334530ddd3e68054cfd01bd3 100644 (file)
--- a/doc/csql.xml
+++ b/doc/csql.xml
@@ -135,20 +135,16 @@
     </para>
 
 <programlisting>
-CREATE TABLE EMPLOYEE (
-       emplid          NOT NULL        number(38),
-       first_name      NOT NULL        varchar2(30),
-       last_name       NOT NULL        varchar2(30),
-       emall                           varchar2(100),
-       companyid       NOT NULL        number(38),
-       managerid                       number(38)
-)
-
-CREATE TABLE COMPANY (
-       companyid       NOT NULL        number(38),
-       name            NOT NULL        varchar2(100),
-       presidentid     NOT NULL        number(38)
-)
+CREATE TABLE EMPLOYEE ( emplid     NOT NULL number(38),
+                        first_name NOT NULL varchar2(30),
+                        last_name  NOT NULL varchar2(30),
+                        email               varchar2(100),
+                        companyid  NOT NULL number(38),
+                        managerid           number(38))
+
+CREATE TABLE COMPANY ( companyid   NOT NULL number(38),
+                       name        NOT NULL varchar2(100),
+                       presidentid NOT NULL number(38))
 </programlisting>
 
 <para>
@@ -189,7 +185,7 @@ mapped into a database).  They would be defined as follows:
 
 (clsql:def-view-class company ()
   ((companyid
-    :db-type :key
+    :db-kind :key
     :db-constraints :not-null
     :type integer
     :initarg :companyid)
@@ -303,7 +299,7 @@ mapped into a database).  They would be defined as follows:
 <para>
 In an &sql; only application, the <symbol>EMPLOYEE</symbol> and
 <symbol>COMPANY</symbol> tables can be queried to determine things
-like, "Who is Vladamir's manager?", What company does Josef work
+like, "Who is Vladamir's manager?", "What company does Josef work
 for?", and "What employees work for Widgets Inc.".  This is done by
 joining tables with an &sql; query.
 </para>

diff --git a/examples/clsql-tutorial.lisp b/examples/clsql-tutorial.lisp
index 2afb0f8e020312178a86c223b2782ddd47a0cff6..bb976a7883f64c085c81cb43c72e170fdc1040a1 100644 (file)
--- a/examples/clsql-tutorial.lisp
+++ b/examples/clsql-tutorial.lisp
@@ -57,7 +57,7 @@
 
 (clsql:def-view-class company ()
   ((companyid
-    :db-type :key
+    :db-kind :key
     :db-constraints :not-null
     :type integer
     :initarg :companyid)