Remove primary_key overriding in models. Refs #6112

16 files changed, 0 insertions, 29 deletions

diff --git a/app/models/chouette/access_link.rb b/app/models/chouette/access_link.rb
index 4b99ab5ba..6b08443be 100644
--- a/app/models/chouette/access_link.rb
+++ b/app/models/chouette/access_link.rb
@@ -2,8 +2,6 @@ module Chouette
   class AccessLink < Chouette::TridentActiveRecord
     has_paper_trail
     include ObjectidSupport
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     attr_accessor :access_link_type, :link_orientation_type, :link_key
 
diff --git a/app/models/chouette/access_point.rb b/app/models/chouette/access_point.rb
index b6f78f239..ac6580015 100644
--- a/app/models/chouette/access_point.rb
+++ b/app/models/chouette/access_point.rb
@@ -5,8 +5,6 @@ require 'geo_ruby'
 module Chouette
   class AccessPoint < Chouette::ActiveRecord
     has_paper_trail
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     include Geokit::Mappable
     include ProjectionFields
diff --git a/app/models/chouette/connection_link.rb b/app/models/chouette/connection_link.rb
index d5ddc606a..c53d6f5f1 100644
--- a/app/models/chouette/connection_link.rb
+++ b/app/models/chouette/connection_link.rb
@@ -3,8 +3,6 @@ module Chouette
     has_paper_trail
     include ObjectidSupport
     include ConnectionLinkRestrictions
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     attr_accessor :connection_link_type
 
diff --git a/app/models/chouette/group_of_line.rb b/app/models/chouette/group_of_line.rb
index 75ee1ce73..3b6a7cea7 100644
--- a/app/models/chouette/group_of_line.rb
+++ b/app/models/chouette/group_of_line.rb
@@ -5,8 +5,6 @@ module Chouette
     include GroupOfLineRestrictions
     include LineReferentialSupport
 
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     has_and_belongs_to_many :lines, :class_name => 'Chouette::Line', :order => 'lines.name'
 
diff --git a/app/models/chouette/journey_pattern.rb b/app/models/chouette/journey_pattern.rb
index 830e985d9..2a636a041 100644
--- a/app/models/chouette/journey_pattern.rb
+++ b/app/models/chouette/journey_pattern.rb
@@ -4,8 +4,6 @@ module Chouette
     include ChecksumSupport
     include JourneyPatternRestrictions
     include ObjectidSupport
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     belongs_to :route
     has_many :vehicle_journeys, :dependent => :destroy
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index d077d5c9d..b3c4f2463 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -8,8 +8,6 @@ module Chouette
     include StifTransportSubmodeEnumerations
     extend ActiveModel::Naming
 
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     belongs_to :company
     belongs_to :network
diff --git a/app/models/chouette/network.rb b/app/models/chouette/network.rb
index 6843c69ad..942fc5d67 100644
--- a/app/models/chouette/network.rb
+++ b/app/models/chouette/network.rb
@@ -5,8 +5,6 @@ module Chouette
     include LineReferentialSupport
     include ObjectidSupport
     extend Enumerize
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
     has_many :lines
 
     attr_accessor :source_type_name
diff --git a/app/models/chouette/pt_link.rb b/app/models/chouette/pt_link.rb
index d14d5f29c..399539d44 100644
--- a/app/models/chouette/pt_link.rb
+++ b/app/models/chouette/pt_link.rb
@@ -3,8 +3,6 @@ require 'geokit'
 module Chouette
   class PtLink < Chouette::ActiveRecord
     has_paper_trail
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
     include Geokit::Mappable
 
     def geometry
diff --git a/app/models/chouette/route.rb b/app/models/chouette/route.rb
index 3729deb7d..26b80733d 100644
--- a/app/models/chouette/route.rb
+++ b/app/models/chouette/route.rb
@@ -12,8 +12,6 @@ module Chouette
     enumerize :direction, in: %i(straight_forward backward clockwise counter_clockwise north north_west west south_west south south_east east north_east)
     enumerize :wayback, in: %i(outbound inbound), default: :outbound
 
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     def self.nullable_attributes
       [:published_name, :comment, :number, :name, :direction, :wayback]
diff --git a/app/models/chouette/stop_point.rb b/app/models/chouette/stop_point.rb
index 3b9eaa2f6..6b363cd93 100644
--- a/app/models/chouette/stop_point.rb
+++ b/app/models/chouette/stop_point.rb
@@ -9,8 +9,6 @@ module Chouette
     include ForAlightingEnumerations
     include ObjectidSupport
 
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     belongs_to :stop_area
     belongs_to :route, inverse_of: :stop_points
diff --git a/app/models/chouette/time_table.rb b/app/models/chouette/time_table.rb
index 20d6e69ac..506e498b8 100644
--- a/app/models/chouette/time_table.rb
+++ b/app/models/chouette/time_table.rb
@@ -7,8 +7,6 @@ module Chouette
     include ApplicationDaysSupport
     include TimetableSupport
 
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
     acts_as_taggable
 
     attr_accessor :tag_search
diff --git a/app/models/chouette/time_table_date.rb b/app/models/chouette/time_table_date.rb
index 98d8fa765..6a68d7fe1 100644
--- a/app/models/chouette/time_table_date.rb
+++ b/app/models/chouette/time_table_date.rb
@@ -2,7 +2,6 @@ module Chouette
   class TimeTableDate < Chouette::ActiveRecord
     include ChecksumSupport
 
-    self.primary_key = "id"
     belongs_to :time_table, inverse_of: :dates
     acts_as_list :scope => 'time_table_id = #{time_table_id}',:top_of_list => 0
 
diff --git a/app/models/chouette/time_table_period.rb b/app/models/chouette/time_table_period.rb
index d9b707675..6965d828a 100644
--- a/app/models/chouette/time_table_period.rb
+++ b/app/models/chouette/time_table_period.rb
@@ -2,7 +2,6 @@ module Chouette
   class TimeTablePeriod < Chouette::ActiveRecord
     include ChecksumSupport
 
-    self.primary_key = "id"
     belongs_to :time_table, inverse_of: :periods
     acts_as_list :scope => 'time_table_id = #{time_table_id}',:top_of_list => 0
 
diff --git a/app/models/chouette/timeband.rb b/app/models/chouette/timeband.rb
index 6155ffc77..5a4e17b98 100644
--- a/app/models/chouette/timeband.rb
+++ b/app/models/chouette/timeband.rb
@@ -10,7 +10,6 @@ module Chouette
   class Timeband < Chouette::TridentActiveRecord
     include ObjectidSupport
     has_paper_trail
-    self.primary_key = "id"
 
     validates :start_time, :end_time, presence: true
     validates_with Chouette::TimebandValidator
diff --git a/app/models/chouette/vehicle_journey.rb b/app/models/chouette/vehicle_journey.rb
index c5a6901d7..78cb6184c 100644
--- a/app/models/chouette/vehicle_journey.rb
+++ b/app/models/chouette/vehicle_journey.rb
@@ -7,8 +7,6 @@ module Chouette
     include VehicleJourneyRestrictions
     include ObjectidSupport
     include StifTransportModeEnumerations
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     enum journey_category: { timed: 0, frequency: 1 }
 
diff --git a/app/models/chouette/vehicle_journey_at_stop.rb b/app/models/chouette/vehicle_journey_at_stop.rb
index 3b4f35f13..d875442ee 100644
--- a/app/models/chouette/vehicle_journey_at_stop.rb
+++ b/app/models/chouette/vehicle_journey_at_stop.rb
@@ -6,8 +6,6 @@ module Chouette
 
     DAY_OFFSET_MAX = 1
 
-    # FIXME http://jira.codehaus.org/browse/JRUBY-6358
-    self.primary_key = "id"
 
     belongs_to :stop_point
     belongs_to :vehicle_journey