X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=examples%2Fclsql-tutorial.lisp;h=5d1ae7f7aed6ac93314752df9099f3db960443ac;hb=29f26325a5d91c9906117bf51fbefdf477e61451;hp=bb976a7883f64c085c81cb43c72e170fdc1040a1;hpb=9dd1aaa4e36d0d9a13e68cb501f1d17dbb10c209;p=clsql.git

diff --git a/examples/clsql-tutorial.lisp b/examples/clsql-tutorial.lisp
index bb976a7..5d1ae7f 100644
--- a/examples/clsql-tutorial.lisp
+++ b/examples/clsql-tutorial.lisp
@@ -18,7 +18,6 @@
   ((emplid
     :db-kind :key
     :db-constraints :not-null
-    :nulls-ok nil
     :type integer
     :initarg :emplid)
    (first-name
@@ -32,7 +31,6 @@
    (email
     :accessor employee-email
     :type (string 100)
-    :nulls-ok t
     :initarg :email)
    (companyid
     :type integer)
@@ -45,7 +43,7 @@
 			  :set nil))
    (managerid
     :type integer
-    :nulls-ok t)
+    :initarg :managerid)
    (manager
     :accessor employee-manager
     :db-kind :join
@@ -65,7 +63,8 @@
     :type (string 100)
     :initarg :name)
    (presidentid
-    :type integer)
+    :type integer
+    :initarg :presidentid)
    (president
     :reader president
     :db-kind :join
@@ -105,42 +104,35 @@
 
 
 ;; Create some instances of our view classes
+(defvar company1 (make-instance 'company
+			      :companyid 1
+			      :name "Widgets Inc."
+			      ;; Lenin is president of Widgets Inc.
+			      :presidentid 1))
+
 (defvar employee1 (make-instance 'employee
 			       :emplid 1
 			       :first-name "Vladamir"
 			       :last-name "Lenin"
-			       :email "lenin@soviet.org"))
-
-(defvar company1 (make-instance 'company
-			      :companyid 1
-			      :name "Widgets Inc."))
-			      
+			       :email "lenin@soviet.org"
+			       :companyid 1))
 
 (defvar employee2 (make-instance 'employee
 			       :emplid 2
 			       :first-name "Josef"
 			       :last-name "Stalin"
-			       :email "stalin@soviet.org"))
-
-;; Lenin manages Stalin (for now)
-(clsql:add-to-relation employee2 'manager employee1)
-
-;; Lenin and Stalin both work for Widgets Inc.
-(clsql:add-to-relation company1 'employees employee1)
-(clsql:add-to-relation company1 'employees employee2)
-
-;; Lenin is president of Widgets Inc.
-(clsql:add-to-relation company1 'president employee1)
+			       :email "stalin@soviet.org"
+			       :companyid 1
+			       ;; Lenin manages Stalin (for now)
+			       :managerid 1))
 
 (clsql:update-records-from-instance employee1)
 (clsql:update-records-from-instance employee2)
 (clsql:update-records-from-instance company1)
 
-;; lets us use the functional
-;; sql interface 
+;; lets use the functional sql interface 
 (clsql:locally-enable-sql-reader-syntax)
 
-
 (format t "The email address of ~A ~A is ~A"
 	(first-name employee1)
 	(last-name employee1)