[24826] users/jberry/mpwa

[source_changes at macosforge.org]

Revision: 24826
          http://trac.macosforge.org/projects/macports/changeset/24826
Author:   jberry at macports.org
Date:     2007-05-05 15:23:17 -0700 (Sat, 05 May 2007)

Log Message:
-----------
mpwa: mark some dependency chains for destroy

Modified Paths:
--------------
    users/jberry/mpwa/app/models/port.rb
    users/jberry/mpwa/app/models/port_pkg.rb
    users/jberry/mpwa/app/models/port_pkg_file.rb
    users/jberry/mpwa/doc/TODO.txt

Modified: users/jberry/mpwa/app/models/port.rb
===================================================================
--- users/jberry/mpwa/app/models/port.rb	2007-05-05 22:04:24 UTC (rev 24825)
+++ users/jberry/mpwa/app/models/port.rb	2007-05-05 22:23:17 UTC (rev 24826)
@@ -3,7 +3,7 @@
 require 'tag'
 
 class Port < ActiveRecord::Base
-    has_many :port_pkgs
+    has_many :port_pkgs, :dependent => :destroy
     has_and_belongs_to_many :tags
     has_and_belongs_to_many :maintainers, :class_name => 'Person', :join_table => 'maintainers_ports' 
     

Modified: users/jberry/mpwa/app/models/port_pkg.rb
===================================================================
--- users/jberry/mpwa/app/models/port_pkg.rb	2007-05-05 22:04:24 UTC (rev 24825)
+++ users/jberry/mpwa/app/models/port_pkg.rb	2007-05-05 22:23:17 UTC (rev 24826)
@@ -20,8 +20,8 @@
 class PortPkg < ActiveRecord::Base
     belongs_to :port
     belongs_to :submitter, :class_name => 'Person', :foreign_key => 'submitter_id'
-    has_many :files, :class_name => 'PortPkgFile'
-    has_many :variants
+    has_many :files, :class_name => 'PortPkgFile', :dependent => :destroy
+    has_many :variants, :dependent => :destroy
     has_and_belongs_to_many :tags
     
     def PortPkg.create_from_file(file)

Modified: users/jberry/mpwa/app/models/port_pkg_file.rb
===================================================================
--- users/jberry/mpwa/app/models/port_pkg_file.rb	2007-05-05 22:04:24 UTC (rev 24825)
+++ users/jberry/mpwa/app/models/port_pkg_file.rb	2007-05-05 22:23:17 UTC (rev 24826)
@@ -5,6 +5,7 @@
 
 class PortPkgFile < ActiveRecord::Base
     belongs_to :port_pkg
+    before_destroy { |f| FileBlob.delete_all "port_pkg_file_id = #{f.id}" }
     #has_many :file_blob -- we don't use this association to avoid keeping many blobs in memory
     
     def PortPkgFile.from_path(port_pkg, path, path_root = nil, options = {})

Modified: users/jberry/mpwa/doc/TODO.txt
===================================================================
--- users/jberry/mpwa/doc/TODO.txt	2007-05-05 22:04:24 UTC (rev 24825)
+++ users/jberry/mpwa/doc/TODO.txt	2007-05-05 22:23:17 UTC (rev 24826)
@@ -4,7 +4,6 @@
 	- Security cleanup (edit)
 	- Submit should bail (or prompt) on no submitter information
 	- mpwa submit should handle case of no submitter information: currently a blank submitter record is created for each such.
-	- Revise fastload to simplify sqlite3 sourcing
 	- Add a darwinports path to ~/.macports, and ensure it exists:
 	    - ~/macports
 	    - ~/macports/ports.conf

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070505/184a489a/attachment.html