localizable_db 2.0.8 → 2.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72d05a5d0122ca0e6cefa8dbd9a57b177f576be071f19d6085f9b13eb5725ca1
-  data.tar.gz: b725681ea0b45ae0aeec763ca20cec927d92b66ebbf7c41d788e3c5e13ac3645
+  metadata.gz: dd7ed85912247dda8621b2eaddd5c7dd1fa9998b030ac79cf2bcc6f4066001a2
+  data.tar.gz: a1ae01329a73d95eeeca91c5bacb500f0bb805ae24a9faaf161d9a8b21c9fbc2
 SHA512:
-  metadata.gz: 2cd13ae434121fbeee9daaae6fb14499c6d998e5513a901739c5d6e1980dca255a205a64705bb4d9ff5ccb7a9ae2700c2783238ccf860e18ef7beaf54ea239c6
-  data.tar.gz: 67026c758080e081e83d0a8151dba7093f5e5668baa92cdb370f0cc188d59d099c98de68c68b18a830bf3daf89f361e9eb76b1617fe812eccdd83fab9825765c
+  metadata.gz: 441c813a4a6cc1b5eea7c81c47bd262c1d57c67c200227412c5d461d2ea13ed96fb6c79169f86a073fe6c53dff8fac98681bc44af0d6a9325209a17b50122967
+  data.tar.gz: 27e175d63e8e56c25e94cec662549c57ce2ba25212945ef3c68391954b1bfa7623ef20f89430c7700c9def4232659d9e7b68dc43bab5461e8329d627b700c266

data/lib/localizable_db/localizable.rb

@@ -112,6 +112,7 @@ module LocalizableDb
                     WHERE #{self.localized_table_name}.locale = '#{language}'
                 ) AS #{self.localized_table_name}
                   ON #{self.localized_table_name}.locale = '#{language}'
+                  AND #{self.localized_table_name}.localizable_object_id = #{self.table_name}.id
                 ) AS #{self.table_name}
             ")
           end
@@ -130,7 +131,8 @@ module LocalizableDb
                 FROM #{self.localized_table_name}
                 WHERE #{self.localized_table_name}.locale = '#{language.to_s}'
               ) AS #{language.to_s}_#{self.localized_table_name} 
-              ON #{language.to_s}_#{self.localized_table_name}.locale = '#{language.to_s}'"
+              ON #{language.to_s}_#{self.localized_table_name}.locale = '#{language.to_s}'
+              AND #{language.to_s}_#{self.localized_table_name}.localizable_object_id = #{self.table_name}.id "
             end
             from("
                (SELECT #{self.table_name}.id, #{attrs_to_select.join(', ')}
@@ -146,9 +148,9 @@ module LocalizableDb
                 end - self.localizable_attributes.map do |attribute|
                   "#{self.table_name}.#{attribute.to_s}"
                 end |  self.localizable_attributes.map do |attribute|
-                ["#{self.localized_table_name}.#{attribute.to_s}","#{self.localized_table_name}.#{attribute.to_s} as #{language}_#{attribute}"]
+                 "#{self.localized_table_name}.#{attribute.to_s} as #{language}_#{attribute}"
                 end
-                attrs_to_select.flatten!
+                attrs_to_select
             else
                 attrs_to_select = self.attribute_names - ["id"]
                 attrs_to_select = attrs_to_select.map do |attribute|

data/lib/localizable_db/version.rb

@@ -1,3 +1,3 @@
 module LocalizableDb
-    VERSION = '2.0.8'
+    VERSION = '2.0.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: localizable_db
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.10
 platform: ruby
 authors:
 - Yonga9121