yaml_db 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5995c6d00a829354fa29d06db8d4de7541dd42ab
-  data.tar.gz: 3c701640c43102149a3213e06aa4fc7e436f582f
+  metadata.gz: 8a4e39c17d583195897d45248f0aca67b9cbdb31
+  data.tar.gz: fdcf74702568fb3fafe04cd4956a0c25cf9f4c48
 SHA512:
-  metadata.gz: 3670c4e9264ec1af0f5038c655f776b927780c3c0cfdb8a33b1e762a86efea1c0e38d582160ce8eaa38d3252c8c0f7dce02a036ebc25d62e9cba7e35ac010ad5
-  data.tar.gz: 06c756dc6c804f5094f8475220f505002dc70f1fbd2463b6512a09f8293e695995c6c1753ded7ea84d1b343b4c2cdfd42ea1e343d3580ee90f32d6b455d068b4
+  metadata.gz: 228b520f88360a5fc698f5809bc0b917c6669d74156c7d0f174631c59c76d8bcb3b09e9eaa982cff136f5bf8a1e9ea59cc99391a6bc570d3548c2f39c998ea8b
+  data.tar.gz: 0e329ffcd25e425cd75da70cc8ebc51299c14308d3614169b6692f186c876c725ce3b6da9e63657a698655e5d3acfd0b649d029d0d677dc477f6dbea2e053f05

data/lib/yaml_db/serialization_helper.rb

@@ -141,6 +141,9 @@ module YamlDb
         ActiveRecord::Base.connection.quote_table_name(table)
       end
 
+      def self.quote_column(column)
+        ActiveRecord::Base.connection.quote_column_name(column)
+      end
     end
 
     class Dump
@@ -179,12 +182,12 @@ module YamlDb
       def self.each_table_page(table, records_per_page=1000)
         total_count = table_record_count(table)
         pages = (total_count.to_f / records_per_page).ceil - 1
-        id = table_column_names(table).first
+        key = sort_key(table)
         boolean_columns = Utils.boolean_columns(table)
         quoted_table_name = Utils.quote_table(table)
 
         (0..pages).to_a.each do |page|
-          query = Arel::Table.new(table).order(id).skip(records_per_page*page).take(records_per_page).project(Arel.sql('*'))
+          query = Arel::Table.new(table).order(key).skip(records_per_page*page).take(records_per_page).project(Arel.sql('*'))
           records = ActiveRecord::Base.connection.select_all(query.to_sql)
           records = Utils.convert_booleans(records, boolean_columns)
           yield records
@@ -195,7 +198,17 @@ module YamlDb
         ActiveRecord::Base.connection.select_one("SELECT COUNT(*) FROM #{Utils.quote_table(table)}").values.first.to_i
       end
 
-    end
+      # Just return the first column as sort key unless the table looks like a
+      # standard HABTM join table, in which case add the second "id column"
+      def self.sort_key(table)
+        first_column, second_column = table_column_names(table)
 
+        if [first_column, second_column].all? { |name| name =~ /_id$/ }
+          [Utils.quote_column(first_column), Utils.quote_column(second_column)]
+        else
+          Utils.quote_column(first_column)
+        end
+      end
+    end
   end
 end

data/lib/yaml_db/version.rb

@@ -1,3 +1,3 @@
 module YamlDb
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml_db
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Adam Wiggins
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: yaml_db allows export/import of database into/from yaml files