projects
/
clsql.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ef93cbe
)
Fix broken tests for nodes datasets by adding :autoincrement constraints.
author
Holger Schauer
<Holger.Schauer@gmx.de>
Thu, 3 Mar 2011 15:01:21 +0000
(16:01 +0100)
committer
Kevin M. Rosenberg
<kevin@rosenberg.net>
Wed, 30 Mar 2011 00:20:06 +0000
(18:20 -0600)
tests/ds-nodes.lisp
patch
|
blob
|
history
diff --git
a/tests/ds-nodes.lisp
b/tests/ds-nodes.lisp
index bb43ff09de8579b126f4052cf9c8ac829b37f828..50c6aea08b0de79b26f73938e458996f8a8af03f 100644
(file)
--- a/
tests/ds-nodes.lisp
+++ b/
tests/ds-nodes.lisp
@@
-32,19
+32,20
@@
(def-view-class setting (node)
((setting-id :accessor setting-id :initarg :setting-id
(def-view-class setting (node)
((setting-id :accessor setting-id :initarg :setting-id
- :type integer :db-kind :key :db-constraints (:not-null))
+ :type integer :db-kind :key :db-constraints (:not-null
:auto-increment
))
(vars :accessor vars :initarg :vars :type (varchar 240)))
(:normalizedp t))
(def-view-class user (node)
((user-id :accessor user-id :initarg :user-id
(vars :accessor vars :initarg :vars :type (varchar 240)))
(:normalizedp t))
(def-view-class user (node)
((user-id :accessor user-id :initarg :user-id
- :type integer :db-kind :key :db-constraints (:not-null))
+ :type integer :db-kind :key :db-constraints (:not-null
:auto-increment
))
(nick :accessor nick :initarg :nick :type (varchar 64)))
(nick :accessor nick :initarg :nick :type (varchar 64)))
+ (:base-table "nodeuser")
(:normalizedp t))
(def-view-class theme (setting)
((theme-id :accessor theme-id :initarg :theme-id
(:normalizedp t))
(def-view-class theme (setting)
((theme-id :accessor theme-id :initarg :theme-id
- :type integer :db-kind :key :db-constraints (:not-null))
+ :type integer :db-kind :key :db-constraints (:not-null
:auto-increment
))
(doc :accessor doc :initarg :doc :type (varchar 240)))
(:normalizedp t))
(doc :accessor doc :initarg :doc :type (varchar 240)))
(:normalizedp t))
@@
-56,7
+57,7
@@
(def-view-class subloc (location)
((subloc-id :accessor subloc-id :initarg :subloc-id
(def-view-class subloc (location)
((subloc-id :accessor subloc-id :initarg :subloc-id
- :type integer :db-kind :key :db-constraints (:not-null))
+ :type integer :db-kind :key :db-constraints (:not-null
:auto-increment
))
(loc :accessor loc :initarg :loc :type (varchar 64)))
(:normalizedp t))
(loc :accessor loc :initarg :loc :type (varchar 64)))
(:normalizedp t))
@@
-112,6
+113,12
@@
(:setup initialize-ds-nodes)
(:cleanup (lambda ()
(mapc #'clsql-sys:drop-view-from-class
(:setup initialize-ds-nodes)
(:cleanup (lambda ()
(mapc #'clsql-sys:drop-view-from-class
- '(node setting user theme location subloc)))))
+ '(node setting user theme location subloc))
+ (ignore-errors
+ (clsql-sys:execute-command "DROP TABLE nodeuser")
+ (mapc #'clsql-sys:drop-sequence
+ '(node_node_id_seq setting_setting_id_seq subloc_subloc_id_seq
+ theme_theme_id_seq nodeuser_user_id_seq)
+ )))))
#.(clsql:restore-sql-reader-syntax-state)
#.(clsql:restore-sql-reader-syntax-state)