You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ga...@apache.org on 2009/09/17 17:09:06 UTC

svn commit: r816225 - /roller/trunk/apps/weblogger/src/sql/createdb.vm

Author: gangolli
Date: Thu Sep 17 15:09:06 2009
New Revision: 816225

URL: http://svn.apache.org/viewvc?rev=816225&view=rev
Log:
Fix some errors and duplicates in the mediafile constraints

Modified:
    roller/trunk/apps/weblogger/src/sql/createdb.vm

Modified: roller/trunk/apps/weblogger/src/sql/createdb.vm
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/sql/createdb.vm?rev=816225&r1=816224&r2=816225&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/sql/createdb.vm (original)
+++ roller/trunk/apps/weblogger/src/sql/createdb.vm Thu Sep 17 15:09:06 2009
@@ -610,18 +610,19 @@
 alter table bookmark add constraint bm_folderid_fk
     foreign key ( folderid ) references folder( id ) $!db.ADDL_FK_PARAMS ;
 
--- media files
-alter table media_file add constraint media_file_directoryid_fk
-    foreign key (directoryid) references media_file_directory(id) $!db.ADDL_FK_PARAMS ;
+-- media file foreign key constraints
 
-alter table media_file_tag add constraint media_file_id_tag_fk
-    foreign key (media_file_id) references media_file(id) $!db.ADDL_FK_PARAMS ;
+alter table roller_mediafile add constraint media_file_directoryid_fk
+    foreign key (directoryid) references roller_mediafiledir(id) $!db.ADDL_FK_PARAMS ;
 
-alter table media_file_directory add constraint mf_websiteid_fk
+alter table roller_mediafiletag add constraint media_file_id_tag_fk
+    foreign key (mediafile_id) references roller_mediafile(id) $!db.ADDL_FK_PARAMS ;
+
+alter table roller_mediafiledir add constraint mf_websiteid_fk
     foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
 
-alter table media_file_directory add constraint mf_parentid_fk
-    foreign key ( parentid ) references media_file_directory( id )  $!db.ADDL_FK_PARAMS ;
+alter table roller_mediafiledir add constraint mf_parentid_fk
+    foreign key ( parentid ) references roller_mediafiledir( id )  $!db.ADDL_FK_PARAMS ;
 
 -- newsfeed
 
@@ -652,21 +653,6 @@
 -- alter table webpage add constraint webpage_websiteid_fk foreign key ( websiteid ) references website( id );
 
 
--- media blogging indexes
-
-alter table roller_mediafile add constraint roller_mediafiledir_id_fk
-    foreign key (directory_id) references roller_mediafiledir(id) $!db.ADDL_FK_PARAMS ;
-
-alter table roller_mediafiletag add constraint roller_mediafile_id_tag_fk
-    foreign key (mediafile_id) references roller_mediafile(id) $!db.ADDL_FK_PARAMS ;
-
-alter table roller_mediafiledir add constraint mf_websiteid_fk
-    foreign key ( websiteid ) references website( id ) $!db.ADDL_FK_PARAMS ;
-
-alter table roller_mediafiledir add constraint mf_parentid_fk
-    foreign key ( parentid ) references roller_mediafiledir( id )  $!db.ADDL_FK_PARAMS ;
-
-
 -- oauth indexes
 
 create index oc_username_idx  on roller_oauthconsumer( username$!db.INDEXSIZE );