Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 87466 invoked from network); 17 Sep 2009 15:09:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Sep 2009 15:09:28 -0000 Received: (qmail 78658 invoked by uid 500); 17 Sep 2009 15:09:28 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 78633 invoked by uid 500); 17 Sep 2009 15:09:28 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 78624 invoked by uid 99); 17 Sep 2009 15:09:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Sep 2009 15:09:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Sep 2009 15:09:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C519F2388965; Thu, 17 Sep 2009 15:09:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r816225 - /roller/trunk/apps/weblogger/src/sql/createdb.vm Date: Thu, 17 Sep 2009 15:09:06 -0000 To: commits@roller.apache.org From: gangolli@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090917150906.C519F2388965@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 );