Replace composite_primary_keys with rails builtin support

[rails.git] / app / models / language.rb

diff --git a/app/models/language.rb b/app/models/language.rb
index 3a63176f618c52f7788111f91e112a7fcb66ebd9..8d3e4583fad137db074ed85614a27becdaeaf759 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,19 +1,24 @@
-class Language < ActiveRecord::Base
-  self.primary_key = "code"
+# == Schema Information
+#
+# Table name: languages
+#
+#  code         :string           not null, primary key
+#  english_name :string           not null
+#  native_name  :string
+#

 
 

-  has_many :diary_entries, :foreign_key => 'language'
+class Language < ApplicationRecord
+  has_many :diary_entries, :foreign_key => "language", :inverse_of => :language

 
   def self.load(file)
     Language.transaction do
 
   def self.load(file)
     Language.transaction do

-      YAML.load(File.read(file)).each do |k,v|
-        begin
-          Language.update(k, :english_name => v["english"], :native_name => v["native"])
-        rescue ActiveRecord::RecordNotFound
-          Language.create do |l|
-            l.code = k
-            l.english_name = v["english"]
-            l.native_name = v["native"]
-          end
+      YAML.safe_load_file(file).each do |k, v|
+        Language.update(k, :english_name => v["english"], :native_name => v["native"])
+      rescue ActiveRecord::RecordNotFound
+        Language.create do |l|
+          l.code = k
+          l.english_name = v["english"]
+          l.native_name = v["native"]

         end
       end
     end
         end
       end
     end


@@ -23,5 +28,5 @@ class Language < ActiveRecord::Base
     name = english_name
     name += " (#{native_name})" unless native_name.nil?
     name
     name = english_name
     name += " (#{native_name})" unless native_name.nil?
     name

-  end  
+  end

 end
 end