Replace deprecated methods with modern equivalents

diff --git a/app/models/changeset_tag.rb b/app/models/changeset_tag.rb
index bd0417ab4255af3a32ff6a56b4a895a3460a02ee..0425fa6b40ae580587ea0ac736c0831f8333fb57 100644 (file)
--- a/app/models/changeset_tag.rb
+++ b/app/models/changeset_tag.rb
@@ -1,5 +1,5 @@
 class ChangesetTag < ActiveRecord::Base
 class ChangesetTag < ActiveRecord::Base

-  set_primary_keys :changeset_id, :k
+  self.primary_keys = "changeset_id", "k"

 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

diff --git a/app/models/language.rb b/app/models/language.rb
index 7bb0b6e771a7e692aad56464ec969758524cab27..3a63176f618c52f7788111f91e112a7fcb66ebd9 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,5 +1,5 @@
 class Language < ActiveRecord::Base
 class Language < ActiveRecord::Base

-  set_primary_key :code
+  self.primary_key = "code"

 
   has_many :diary_entries, :foreign_key => 'language'
 
 
   has_many :diary_entries, :foreign_key => 'language'
 

diff --git a/app/models/node.rb b/app/models/node.rb
index 0f176067d75e8aeb218c51ae8eaf3258f36a0e81..96d927b2c9144f8e915111990d16ad8834e15da4 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -4,7 +4,7 @@ class Node < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
 
   include GeoRecord
   include ConsistencyValidations
 

-  set_table_name 'current_nodes'
+  self.table_name = "current_nodes"

 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

diff --git a/app/models/node_tag.rb b/app/models/node_tag.rb
index 6bc1c555e6e4e79b8cd8923d93f6815ec322a3b6..6f1bf0388a5c0bd3417c8a52fada295dcb838e77 100644 (file)
--- a/app/models/node_tag.rb
+++ b/app/models/node_tag.rb
@@ -1,6 +1,6 @@
 class NodeTag < ActiveRecord::Base
 class NodeTag < ActiveRecord::Base

-  set_table_name 'current_node_tags'
-  set_primary_keys :node_id, :k
+  self.table_name = "current_node_tags"
+  self.primary_keys = "node_id", "k"

 
   belongs_to :node
   
 
   belongs_to :node
   

diff --git a/app/models/old_node.rb b/app/models/old_node.rb
index f8af91abb3be2c3c4f6a17a161e41eda5ba831c1..64ae1a70c9d8fe2050f2ccb3283bc04414dae030 100644 (file)
--- a/app/models/old_node.rb
+++ b/app/models/old_node.rb
@@ -2,8 +2,8 @@ class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
 
   include GeoRecord
   include ConsistencyValidations
 

-  set_table_name 'nodes'
-  set_primary_keys :node_id, :version
+  self.table_name = "nodes"
+  self.primary_keys = "node_id", "version"

 
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]
 
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]

diff --git a/app/models/old_node_tag.rb b/app/models/old_node_tag.rb
index cd5bc4739195d59f7aa8f8825609f6f52e949c8d..eef1e02d508836f43652df4a8059be79b7e1eb2c 100644 (file)
--- a/app/models/old_node_tag.rb
+++ b/app/models/old_node_tag.rb
@@ -1,6 +1,6 @@
 class OldNodeTag < ActiveRecord::Base
 class OldNodeTag < ActiveRecord::Base

-  set_table_name 'node_tags'
-  set_primary_keys :node_id, :version, :k
+  self.table_name = "node_tags"
+  self.primary_keys = "node_id", "version", "k"

 
   belongs_to :old_node, :foreign_key => [:node_id, :version]
 
 
   belongs_to :old_node, :foreign_key => [:node_id, :version]
 

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 87771caab3440b7603d22143db6f51d88ecd8a0f..a75dacd0eba9b04d28a4e6e3264bc6ea58877dae 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,8 +1,8 @@
 class OldRelation < ActiveRecord::Base
   include ConsistencyValidations
   
 class OldRelation < ActiveRecord::Base
   include ConsistencyValidations
   

-  set_table_name 'relations'
-  set_primary_keys :relation_id, :version
+  self.table_name = "relations"
+  self.primary_keys = "relation_id", "version"

 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

diff --git a/app/models/old_relation_member.rb b/app/models/old_relation_member.rb
index 58d7cccfbd0ed98ff0c9494b2eef45a4cde04cbd..77a5a3786eceebfb25c705762f36fe6508d03b94 100644 (file)
--- a/app/models/old_relation_member.rb
+++ b/app/models/old_relation_member.rb
@@ -1,6 +1,6 @@
 class OldRelationMember < ActiveRecord::Base
 class OldRelationMember < ActiveRecord::Base

-  set_table_name 'relation_members'
-  set_primary_keys :relation_id, :version, :sequence_id
+  self.table_name = "relation_members"
+  self.primary_keys = "relation_id", "version", "sequence_id"

 
   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
   # A bit messy, referring to the current tables, should do for the data browser for now
 
   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
   # A bit messy, referring to the current tables, should do for the data browser for now

diff --git a/app/models/old_relation_tag.rb b/app/models/old_relation_tag.rb
index 032a87c77edfd1547d474cd5d4d7c9b4685b6fcf..49324966f506c2624f0055d9f02fc5f82f2e6911 100644 (file)
--- a/app/models/old_relation_tag.rb
+++ b/app/models/old_relation_tag.rb
@@ -1,6 +1,6 @@
 class OldRelationTag < ActiveRecord::Base
 class OldRelationTag < ActiveRecord::Base

-  set_table_name 'relation_tags'
-    set_primary_keys :relation_id, :version, :k
+  self.table_name = "relation_tags"
+  self.primary_keys = "relation_id", "version", "k"

 
   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
   
 
   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
   

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 00642cdb3568eeb834aa2580652484e5e7a188d9..db8a6df4061ae3f8d60194c86c885f29462d95a5 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -1,8 +1,8 @@
 class OldWay < ActiveRecord::Base
   include ConsistencyValidations
   
 class OldWay < ActiveRecord::Base
   include ConsistencyValidations
   

-  set_table_name 'ways'
-  set_primary_keys :way_id, :version
+  self.table_name = "ways"
+  self.primary_keys = "way_id", "version"

 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

diff --git a/app/models/old_way_node.rb b/app/models/old_way_node.rb
index b613be0b4b80b6c79e0ceb8006034650ab24adb8..23ff503edf665ff922e6fe4b874f5484734f488f 100644 (file)
--- a/app/models/old_way_node.rb
+++ b/app/models/old_way_node.rb
@@ -1,6 +1,6 @@
 class OldWayNode < ActiveRecord::Base
 class OldWayNode < ActiveRecord::Base

-  set_table_name 'way_nodes'
-  set_primary_keys :way_id, :version, :sequence_id
+  self.table_name = "way_nodes"
+  self.primary_keys = "way_id", "version", "sequence_id"

 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
   # A bit messy, referring to current nodes and ways, should do for the data browser for now
 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
   # A bit messy, referring to current nodes and ways, should do for the data browser for now

diff --git a/app/models/old_way_tag.rb b/app/models/old_way_tag.rb
index 9f4adb147fd6572e83f7c00b6e140c0fc14d3eda..9926db1446310fdf46d41aa6592df8f203a59331 100644 (file)
--- a/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@ -1,6 +1,6 @@
 class OldWayTag < ActiveRecord::Base
 class OldWayTag < ActiveRecord::Base

-  set_table_name 'way_tags'
-  set_primary_keys :way_id, :version, :k
+  self.table_name = "way_tags"
+  self.primary_keys = "way_id", "version", "k"

 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
 
 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
 

diff --git a/app/models/relation.rb b/app/models/relation.rb
index 659c4f18a7297651ad1024cf2a59acdb5f0e26a4..908651b646da768af2b4cff8d521220bb59ff735 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -3,7 +3,7 @@ class Relation < ActiveRecord::Base
   
   include ConsistencyValidations
   
   
   include ConsistencyValidations
   

-  set_table_name 'current_relations'
+  self.table_name = "current_relations"

 
   belongs_to :changeset
 
 
   belongs_to :changeset
 

diff --git a/app/models/relation_member.rb b/app/models/relation_member.rb
index c1919b67a6649a9caedf88ebfcc6d0ae7a52e102..aba38511ce5e01399bb702a9ef3115b295cd95fa 100644 (file)
--- a/app/models/relation_member.rb
+++ b/app/models/relation_member.rb
@@ -1,6 +1,6 @@
 class RelationMember < ActiveRecord::Base
 class RelationMember < ActiveRecord::Base

-  set_table_name 'current_relation_members'  
-  set_primary_keys :relation_id, :sequence_id
+  self.table_name = "current_relation_members"
+  self.primary_keys = "relation_id", "sequence_id"

 
   belongs_to :relation
   belongs_to :member, :polymorphic => true
 
   belongs_to :relation
   belongs_to :member, :polymorphic => true

diff --git a/app/models/relation_tag.rb b/app/models/relation_tag.rb
index 2773d0612a30ec2b329df102a9d1f75944fc8664..c665cfef66e0fb19896731d29776d3695715b153 100644 (file)
--- a/app/models/relation_tag.rb
+++ b/app/models/relation_tag.rb
@@ -1,6 +1,6 @@
 class RelationTag < ActiveRecord::Base
 class RelationTag < ActiveRecord::Base

-  set_table_name 'current_relation_tags'
-  set_primary_keys :relation_id, :k
+  self.table_name = "current_relation_tags"
+  self.primary_keys = "relation_id", "k"

 
   belongs_to :relation
 
 
   belongs_to :relation
 

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 3f58cee2ef4008c7604ad4f282290a54d0df12d0..b72fda07dcd7b4b10b13a398b9f89205c936630d 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -1,5 +1,5 @@
 class Trace < ActiveRecord::Base
 class Trace < ActiveRecord::Base

-  set_table_name 'gpx_files'
+  self.table_name = "gpx_files"

 
   belongs_to :user
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all
 
   belongs_to :user
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all

diff --git a/app/models/tracepoint.rb b/app/models/tracepoint.rb
index d4ba39de39368419f2a2434c0ba5acfb2d8a6493..c4ad8e1232790f35ab6bec2801224ef0f21403e1 100644 (file)
--- a/app/models/tracepoint.rb
+++ b/app/models/tracepoint.rb
@@ -1,7 +1,7 @@
 class Tracepoint < ActiveRecord::Base
   include GeoRecord
 
 class Tracepoint < ActiveRecord::Base
   include GeoRecord
 

-  set_table_name 'gps_points'
+  self.table_name = "gps_points"

 
   validates_numericality_of :trackid, :only_integer => true
   validates_numericality_of :latitude, :only_integer => true
 
   validates_numericality_of :trackid, :only_integer => true
   validates_numericality_of :latitude, :only_integer => true

diff --git a/app/models/tracetag.rb b/app/models/tracetag.rb
index f9833e141446125128a07ab5e03a6c21ba2f9bde..d30d9d5ab3e7da3fb8a66ebbeb1a443aa47fb56a 100644 (file)
--- a/app/models/tracetag.rb
+++ b/app/models/tracetag.rb
@@ -1,5 +1,5 @@
 class Tracetag < ActiveRecord::Base
 class Tracetag < ActiveRecord::Base

-  set_table_name 'gpx_file_tags'
+  self.table_name = "gpx_file_tags"

 
   validates_format_of :tag, :with => /^[^\/;.,?]*$/
   validates_length_of :tag, :within => 1..255
 
   validates_format_of :tag, :with => /^[^\/;.,?]*$/
   validates_length_of :tag, :within => 1..255

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 28ef40f1d5c8347597c9f9a790b4d8d002cb63ce..b5110bbf5592fd37b599e8f599ea27c2e77580e7 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,5 +1,6 @@
 class UserPreference < ActiveRecord::Base
 class UserPreference < ActiveRecord::Base

-  set_primary_keys :user_id, :k
+  self.primary_keys = "user_id", "k"
+

   belongs_to :user
   
   validates_length_of :k, :within => 1..255
   belongs_to :user
   
   validates_length_of :k, :within => 1..255

diff --git a/app/models/way.rb b/app/models/way.rb
index 85aca4334a482125a068c9bd21d573d3e6b9dc7e..f1c46abf327cf6d634d426b62b6b3721f118d16d 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -3,7 +3,7 @@ class Way < ActiveRecord::Base
   
   include ConsistencyValidations
 
   
   include ConsistencyValidations
 

-  set_table_name 'current_ways'
+  self.table_name = "current_ways"

   
   belongs_to :changeset
 
   
   belongs_to :changeset
 

diff --git a/app/models/way_node.rb b/app/models/way_node.rb
index 1a2e6928a5e9289dba8a711c467a830eb013ef3f..30d9013565eb9ebf3c78f795e9a51ae7c84304b4 100644 (file)
--- a/app/models/way_node.rb
+++ b/app/models/way_node.rb
@@ -1,6 +1,6 @@
 class WayNode < ActiveRecord::Base
 class WayNode < ActiveRecord::Base

-  set_table_name 'current_way_nodes'
-  set_primary_keys :way_id, :sequence_id
+  self.table_name = "current_way_nodes"
+  self.primary_keys = "way_id", "sequence_id"

 
   belongs_to :way
   belongs_to :node
 
   belongs_to :way
   belongs_to :node

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index f0c5eea8b9e6900587340ff022d2fb5e42b85440..98ff62f5f389a4148a3748a9af399cee8a20db91 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -1,6 +1,6 @@
 class WayTag < ActiveRecord::Base
 class WayTag < ActiveRecord::Base

-  set_table_name 'current_way_tags'
-  set_primary_keys :way_id, :k
+  self.table_name = "current_way_tags"
+  self.primary_keys = "way_id", "k"

 
   belongs_to :way
   
 
   belongs_to :way