From 9dd1aaa4e36d0d9a13e68cb501f1d17dbb10c209 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 18 Apr 2004 16:17:43 +0000 Subject: [PATCH] r9051: db-type to db-kind --- ChangeLog | 7 ++++++- debian/changelog | 6 ++++++ doc/csql.xml | 28 ++++++++++++---------------- examples/clsql-tutorial.lisp | 2 +- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fa9602..faa66e6 100644 --- 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 284e3f0..ed1deee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cl-sql (2.7.7-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg 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 d0d09fa..47491ff 100644 --- a/doc/csql.xml +++ b/doc/csql.xml @@ -135,20 +135,16 @@ -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)) @@ -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: In an &sql; only application, the EMPLOYEE and COMPANY 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. diff --git a/examples/clsql-tutorial.lisp b/examples/clsql-tutorial.lisp index 2afb0f8..bb976a7 100644 --- 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) -- 2.34.1