Replace deprecated methods with modern equivalents

app/models/changeset_tag.rb

@@ -1,5 +1,5 @@
 class ChangesetTag < ActiveRecord::Base
-  set_primary_keys :changeset_id, :k
+  self.primary_keys = "changeset_id", "k"
 
   belongs_to :changeset
 

app/models/language.rb

@@ -1,5 +1,5 @@
 class Language < ActiveRecord::Base
-  set_primary_key :code
+  self.primary_key = "code"
 
   has_many :diary_entries, :foreign_key => 'language'
 

app/models/node.rb

@@ -4,7 +4,7 @@ class Node < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
 
-  set_table_name 'current_nodes'
+  self.table_name = "current_nodes"
 
   belongs_to :changeset
 

app/models/node_tag.rb

@@ -1,6 +1,6 @@
 class NodeTag < ActiveRecord::Base
-  set_table_name 'current_node_tags'
+  self.table_name = "current_node_tags"
-  set_primary_keys :node_id, :k
+  self.primary_keys = "node_id", "k"
 
   belongs_to :node
   

app/models/old_node.rb

@@ -2,8 +2,8 @@ class OldNode < ActiveRecord::Base
   include GeoRecord
   include ConsistencyValidations
 
-  set_table_name 'nodes'
+  self.table_name = "nodes"
-  set_primary_keys :node_id, :version
+  self.primary_keys = "node_id", "version"
 
   validates_presence_of :changeset_id, :timestamp
   validates_inclusion_of :visible, :in => [ true, false ]

app/models/old_node_tag.rb

@@ -1,6 +1,6 @@
 class OldNodeTag < ActiveRecord::Base
-  set_table_name 'node_tags'
+  self.table_name = "node_tags"
-  set_primary_keys :node_id, :version, :k
+  self.primary_keys = "node_id", "version", "k"
 
   belongs_to :old_node, :foreign_key => [:node_id, :version]
 

app/models/old_relation.rb

@@ -1,8 +1,8 @@
 class OldRelation < ActiveRecord::Base
   include ConsistencyValidations
   
-  set_table_name 'relations'
+  self.table_name = "relations"
-  set_primary_keys :relation_id, :version
+  self.primary_keys = "relation_id", "version"
 
   belongs_to :changeset
 

app/models/old_relation_member.rb

@@ -1,6 +1,6 @@
 class OldRelationMember < ActiveRecord::Base
-  set_table_name 'relation_members'
+  self.table_name = "relation_members"
-  set_primary_keys :relation_id, :version, :sequence_id
+  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

app/models/old_relation_tag.rb

@@ -1,6 +1,6 @@
 class OldRelationTag < ActiveRecord::Base
-  set_table_name 'relation_tags'
+  self.table_name = "relation_tags"
-    set_primary_keys :relation_id, :version, :k
+  self.primary_keys = "relation_id", "version", "k"
 
   belongs_to :old_relation, :foreign_key => [:relation_id, :version]
   

app/models/old_way.rb

@@ -1,8 +1,8 @@
 class OldWay < ActiveRecord::Base
   include ConsistencyValidations
   
-  set_table_name 'ways'
+  self.table_name = "ways"
-  set_primary_keys :way_id, :version
+  self.primary_keys = "way_id", "version"
 
   belongs_to :changeset
 

app/models/old_way_node.rb

@@ -1,6 +1,6 @@
 class OldWayNode < ActiveRecord::Base
-  set_table_name 'way_nodes'
+  self.table_name = "way_nodes"
-  set_primary_keys :way_id, :version, :sequence_id
+  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

app/models/old_way_tag.rb

@@ -1,6 +1,6 @@
 class OldWayTag < ActiveRecord::Base
-  set_table_name 'way_tags'
+  self.table_name = "way_tags"
-  set_primary_keys :way_id, :version, :k
+  self.primary_keys = "way_id", "version", "k"
 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
 

app/models/relation.rb

@@ -3,7 +3,7 @@ class Relation < ActiveRecord::Base
   
   include ConsistencyValidations
   
-  set_table_name 'current_relations'
+  self.table_name = "current_relations"
 
   belongs_to :changeset
 

app/models/relation_member.rb

@@ -1,6 +1,6 @@
 class RelationMember < ActiveRecord::Base
-  set_table_name 'current_relation_members'  
+  self.table_name = "current_relation_members"
-  set_primary_keys :relation_id, :sequence_id
+  self.primary_keys = "relation_id", "sequence_id"
 
   belongs_to :relation
   belongs_to :member, :polymorphic => true

app/models/relation_tag.rb

@@ -1,6 +1,6 @@
 class RelationTag < ActiveRecord::Base
-  set_table_name 'current_relation_tags'
+  self.table_name = "current_relation_tags"
-  set_primary_keys :relation_id, :k
+  self.primary_keys = "relation_id", "k"
 
   belongs_to :relation
 

app/models/trace.rb

@@ -1,5 +1,5 @@
 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

app/models/tracepoint.rb

@@ -1,7 +1,7 @@
 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

app/models/tracetag.rb

@@ -1,5 +1,5 @@
 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

app/models/user_preference.rb

@@ -1,5 +1,6 @@
 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

app/models/way.rb

@@ -3,7 +3,7 @@ class Way < ActiveRecord::Base
   
   include ConsistencyValidations
 
-  set_table_name 'current_ways'
+  self.table_name = "current_ways"
   
   belongs_to :changeset
 

app/models/way_node.rb

@@ -1,6 +1,6 @@
 class WayNode < ActiveRecord::Base
-  set_table_name 'current_way_nodes'
+  self.table_name = "current_way_nodes"
-  set_primary_keys :way_id, :sequence_id
+  self.primary_keys = "way_id", "sequence_id"
 
   belongs_to :way
   belongs_to :node

app/models/way_tag.rb

@@ -1,6 +1,6 @@
 class WayTag < ActiveRecord::Base
-  set_table_name 'current_way_tags'
+  self.table_name = "current_way_tags"
-  set_primary_keys :way_id, :k
+  self.primary_keys = "way_id", "k"
 
   belongs_to :way