aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2008-09-22 22:16:37 +0000
committerfrancis <francis>2008-09-22 22:16:37 +0000
commit78f6d3afc814fd9fb8acb565fc3b8d42e43f61ba (patch)
treed48c6b3eb6bd46379b7e9e0552ac1fb1ea25c7f3
parent945b754b9ecc2d6c002245de58d9870f5beb3961 (diff)
Annotate models.
-rw-r--r--app/models/comment.rb4
-rw-r--r--app/models/contact_validator.rb4
-rw-r--r--app/models/incoming_message.rb6
-rw-r--r--app/models/info_request.rb4
-rw-r--r--app/models/info_request_event.rb4
-rw-r--r--app/models/outgoing_message.rb4
-rw-r--r--app/models/post_redirect.rb4
-rw-r--r--app/models/public_body.rb4
-rw-r--r--app/models/public_body_tag.rb4
-rw-r--r--app/models/raw_email.rb11
-rw-r--r--app/models/track_thing.rb4
-rw-r--r--app/models/track_things_sent_email.rb4
-rw-r--r--app/models/user.rb4
-rw-r--r--app/models/user_info_request_sent_alert.rb4
-rw-r--r--db/schema.rb2
15 files changed, 38 insertions, 29 deletions
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 07f562032..967108171 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: comments
#
@@ -19,7 +19,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: comment.rb,v 1.5 2008-09-22 14:22:30 francis Exp $
+# $Id: comment.rb,v 1.6 2008-09-22 22:16:37 francis Exp $
class Comment < ActiveRecord::Base
belongs_to :user
diff --git a/app/models/contact_validator.rb b/app/models/contact_validator.rb
index 8e31a5af6..ff6d3ad49 100644
--- a/app/models/contact_validator.rb
+++ b/app/models/contact_validator.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: contact_validators
#
@@ -15,7 +15,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: contact_validator.rb,v 1.21 2008-09-22 14:22:30 francis Exp $
+# $Id: contact_validator.rb,v 1.22 2008-09-22 22:16:37 francis Exp $
class ContactValidator < ActiveRecord::BaseWithoutTable
column :name, :string
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 54e7b4f7f..59e2ec9a7 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -1,15 +1,15 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: incoming_messages
#
# id :integer not null, primary key
# info_request_id :integer not null
-# raw_data :text not null
# created_at :datetime not null
# updated_at :datetime not null
# cached_attachment_text :text
# cached_main_body_text :text
+# raw_email_id :integer not null
#
# models/incoming_message.rb:
@@ -19,7 +19,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: incoming_message.rb,v 1.148 2008-09-22 22:08:44 francis Exp $
+# $Id: incoming_message.rb,v 1.149 2008-09-22 22:16:37 francis Exp $
# TODO
# Move some of the (e.g. quoting) functions here into rblib, as they feel
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 4e1c24980..6f7273835 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: info_requests
#
@@ -23,7 +23,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: info_request.rb,v 1.141 2008-09-22 22:08:44 francis Exp $
+# $Id: info_request.rb,v 1.142 2008-09-22 22:16:37 francis Exp $
require 'digest/sha1'
require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian')
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index 0c567aac4..f99bfdcf4 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: info_request_events
#
@@ -21,7 +21,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: info_request_event.rb,v 1.59 2008-09-22 14:22:30 francis Exp $
+# $Id: info_request_event.rb,v 1.60 2008-09-22 22:16:37 francis Exp $
class InfoRequestEvent < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index bb49792f9..84fb511d7 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: outgoing_messages
#
@@ -21,7 +21,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: outgoing_message.rb,v 1.65 2008-09-22 14:22:30 francis Exp $
+# $Id: outgoing_message.rb,v 1.66 2008-09-22 22:16:37 francis Exp $
class OutgoingMessage < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb
index e9ca4c859..44cbfbe41 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: post_redirects
#
@@ -26,7 +26,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: post_redirect.rb,v 1.40 2008-09-22 14:22:30 francis Exp $
+# $Id: post_redirect.rb,v 1.41 2008-09-22 22:16:37 francis Exp $
require 'openssl' # for random bytes function
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index dad30c8ab..bc77126d1 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: public_bodies
#
@@ -24,7 +24,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: public_body.rb,v 1.107 2008-09-22 14:22:30 francis Exp $
+# $Id: public_body.rb,v 1.108 2008-09-22 22:16:37 francis Exp $
require 'csv'
require 'set'
diff --git a/app/models/public_body_tag.rb b/app/models/public_body_tag.rb
index 1083830d7..e343b2116 100644
--- a/app/models/public_body_tag.rb
+++ b/app/models/public_body_tag.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: public_body_tags
#
@@ -15,7 +15,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: public_body_tag.rb,v 1.18 2008-09-22 14:22:30 francis Exp $
+# $Id: public_body_tag.rb,v 1.19 2008-09-22 22:16:37 francis Exp $
class PublicBodyTag < ActiveRecord::Base
validates_presence_of :public_body
diff --git a/app/models/raw_email.rb b/app/models/raw_email.rb
index 992e6c143..f4f22d122 100644
--- a/app/models/raw_email.rb
+++ b/app/models/raw_email.rb
@@ -1,10 +1,19 @@
+# == Schema Information
+# Schema version: 67
+#
+# Table name: raw_emails
+#
+# id :integer not null, primary key
+# data :text
+#
+
# models/raw_email.rb:
# The fat part of models/incoming_message.rb
#
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: raw_email.rb,v 1.1 2008-09-22 22:08:44 francis Exp $
+# $Id: raw_email.rb,v 1.2 2008-09-22 22:16:37 francis Exp $
class RawEmail < ActiveRecord::Base
has_one :incoming_message
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index c7b74a634..9a4f8d79f 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: track_things
#
@@ -21,7 +21,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: track_thing.rb,v 1.42 2008-09-22 14:22:30 francis Exp $
+# $Id: track_thing.rb,v 1.43 2008-09-22 22:16:37 francis Exp $
class TrackThing < ActiveRecord::Base
belongs_to :tracking_user, :class_name => 'User'
diff --git a/app/models/track_things_sent_email.rb b/app/models/track_things_sent_email.rb
index 7be956337..4c6ddba19 100644
--- a/app/models/track_things_sent_email.rb
+++ b/app/models/track_things_sent_email.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: track_things_sent_emails
#
@@ -18,7 +18,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: track_things_sent_email.rb,v 1.12 2008-09-22 14:22:30 francis Exp $
+# $Id: track_things_sent_email.rb,v 1.13 2008-09-22 22:16:37 francis Exp $
class TrackThingsSentEmail < ActiveRecord::Base
belongs_to :info_request_event
diff --git a/app/models/user.rb b/app/models/user.rb
index f2f6c46f5..558c2ad3f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: users
#
@@ -22,7 +22,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: user.rb,v 1.70 2008-09-22 14:22:30 francis Exp $
+# $Id: user.rb,v 1.71 2008-09-22 22:16:37 francis Exp $
require 'digest/sha1'
diff --git a/app/models/user_info_request_sent_alert.rb b/app/models/user_info_request_sent_alert.rb
index d83808a20..7dd1ecf01 100644
--- a/app/models/user_info_request_sent_alert.rb
+++ b/app/models/user_info_request_sent_alert.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 66
+# Schema version: 67
#
# Table name: user_info_request_sent_alerts
#
@@ -17,7 +17,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: user_info_request_sent_alert.rb,v 1.23 2008-09-22 14:22:30 francis Exp $
+# $Id: user_info_request_sent_alert.rb,v 1.24 2008-09-22 22:16:37 francis Exp $
class UserInfoRequestSentAlert < ActiveRecord::Base
belongs_to :user
diff --git a/db/schema.rb b/db/schema.rb
index bce1b4d10..5d9b620e0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -140,7 +140,7 @@ ActiveRecord::Schema.define(:version => 67) do
end
create_table "raw_emails", :force => true do |t|
- t.binary "data", :null => false
+ t.text "data"
end
create_table "track_things", :force => true do |t|