summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Fowler <spider@viovio.com>2007-09-15 01:50:28 +0000
committerChristian Fowler <spider@viovio.com>2007-09-15 01:50:28 +0000
commitd095f0079be0d9704481b13ec1e2f24489b690cf (patch)
treed7496d8d08f97a3bdb7ce736dbf2795de362161a
parentfd73cbac8726c63fb6a237165e8655d89020200e (diff)
downloadusers-d095f0079be0d9704481b13ec1e2f24489b690cf.tar.gz
users-d095f0079be0d9704481b13ec1e2f24489b690cf.tar.bz2
users-d095f0079be0d9704481b13ec1e2f24489b690cf.zip
schema clean up to avoid chicken-n-egg constraint violationsPRE_LIB_ATTACHMENT_REFACTOR
-rw-r--r--admin/schema_inc.php11
1 files changed, 5 insertions, 6 deletions
diff --git a/admin/schema_inc.php b/admin/schema_inc.php
index d80e5a7..66ffb80 100644
--- a/admin/schema_inc.php
+++ b/admin/schema_inc.php
@@ -22,21 +22,20 @@ $tables = array(
avatar_attachment_id I4,
portrait_attachment_id I4,
logo_attachment_id I4
-",
-/* chicken-and-egg constraint dependencies: Liberty needs user_id, Users needs liberty
CONSTRAINT ', CONSTRAINT `users_avatar_attach_ref` FOREIGN KEY (`avatar_attachment_id`) REFERENCES `".BIT_DB_PREFIX."liberty_attachments` (`attachment_id`)
, CONSTRAINT `users_content_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content` (`content_id`)
, CONSTRAINT `users_portrait_attach_ref` FOREIGN KEY (`portrait_attachment_id`) REFERENCES `".BIT_DB_PREFIX."liberty_attachments` (`attachment_id`)
- , CONSTRAINT `users_logo_attach_ref` FOREIGN KEY (`logo_attachment_id`) REFERENCES `".BIT_DB_PREFIX."liberty_attachments` (`attachment_id`)' */
+ , CONSTRAINT `users_logo_attach_ref` FOREIGN KEY (`logo_attachment_id`) REFERENCES `".BIT_DB_PREFIX."liberty_attachments` (`attachment_id`)'
+",
'users_favorites_map' => "
favorite_content_id I4 PRIMARY,
user_id I4 PRIMARY,
map_position I4
- CONSTRAINT ', CONSTRAINT `users_fav_user_ref` FOREIGN KEY (`user_id`) REFERENCES `".BIT_DB_PREFIX."users_users` (`user_id`)'
+ CONSTRAINT ', CONSTRAINT `users_fav_user_ref` FOREIGN KEY (`user_id`) REFERENCES `".BIT_DB_PREFIX."users_users` (`user_id`)
+ , CONSTRAINT `users_fav_con_ref` FOREIGN KEY (`favorite_content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content` (`content_id`)'
+ '
",
-// another chicken and egg thing.
-// , CONSTRAINT `users_fav_con_ref` FOREIGN KEY (`favorite_content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content` (`content_id`)'
'users_permissions' => "
perm_name C(30) PRIMARY,