r10742: 17 Sep 2005 Kevin Rosenberg <kevin@rosenberg.net>

[clsql.git] / examples / clsql-tutorial.lisp

diff --git a/examples/clsql-tutorial.lisp b/examples/clsql-tutorial.lisp
index cf27468c167f71a98f3b29e838337f39d395594d..265ae6d2e34edb1930ac537b1a4c77d29f2b3aca 100644 (file)
--- a/examples/clsql-tutorial.lisp
+++ b/examples/clsql-tutorial.lisp
@@ -4,8 +4,9 @@
 
 ;; You must set these variables to appropriate values. 
 (defvar *tutorial-database-type* nil 
-  "Possible values are :postgresql,:postgresql-socket :mysql or :sqlite")
-(defvar *tutorial-database-name* ""
+  "Possible values are :postgresql :postgresql-socket, :mysql,
+:oracle, :odbc, :aodbc or :sqlite")
+(defvar *tutorial-database-name* "clsqltut"
   "The name of the database we will work in.")
 (defvar *tutorial-database-user* "" 
   "The name of the database user we will work as.")
@@ -18,7 +19,6 @@
   ((emplid
     :db-kind :key
     :db-constraints :not-null
-    :nulls-ok nil
     :type integer
     :initarg :emplid)
    (first-name
@@ -32,10 +32,10 @@
    (email
     :accessor employee-email
     :type (string 100)
-    :nulls-ok t
     :initarg :email)
    (companyid
-    :type integer)
+    :type integer
+    :initarg :companyid)
    (company
     :accessor employee-company
     :db-kind :join
@@ -45,7 +45,6 @@
                          :set nil))
    (managerid
     :type integer
-    :nulls-ok t
     :initarg :managerid)
    (manager
     :accessor employee-manager
@@ -86,11 +85,21 @@
 
 ;; Connect to the database (see the CLSQL documentation for vendor
 ;; specific connection specs).
-(clsql:connect `(,*tutorial-database-server* 
-              ,*tutorial-database-name*
-              ,*tutorial-database-user* 
-              ,*tutorial-database-password*)
-            :database-type *tutorial-database-type*)
+(case *tutorial-database-type*
+  ((:mysql :postgresql :postgresql-socket)
+   (clsql:connect `(,*tutorial-database-server* 
+                   ,*tutorial-database-name*
+                   ,*tutorial-database-user* 
+                   ,*tutorial-database-password*)
+                 :database-type *tutorial-database-type*))
+  ((:odbc :aodbc :oracle)
+   (clsql:connect `(,*tutorial-database-name* 
+                   ,*tutorial-database-user* 
+                   ,*tutorial-database-password*)
+                 :database-type *tutorial-database-type*))
+  (:sqlite
+   (clsql:connect `(,*tutorial-database-name*)
+                 :database-type *tutorial-database-type*)))
 
 ;; Record the sql going out, helps us learn what is going
 ;; on behind the scenes
@@ -148,7 +157,8 @@
 
 (let ((new-lenin (car
                  (clsql:select 'employee
-                             :where [= [slot-value 'employee 'emplid] 1]))))
+                             :where [= [slot-value 'employee 'emplid] 1]
+                             :flatp t))))
   (format t "His new email is ~A"
          (employee-email new-lenin)))