relation_to_struct 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b62c263648a096f761f894079cb6d4e67a65cae
-  data.tar.gz: 0135d8bf011a7376f9147719c32ff16b4228550b
+  metadata.gz: 4917a1af7ed5ef3d71c3f31314f67cf7150f2903
+  data.tar.gz: d1e99802577449b4b789a7b52476a4a7333b6b36
 SHA512:
-  metadata.gz: b1bf48925ba3b32d38fd0bb66e367e7653b8d968b6bcd8bc3a207d3458a4daa5b45cde15f6e9970c0c15a49e7f2701f8b15aa0818152de1322786afb9ce3fa88
-  data.tar.gz: 6bf2353d27fbd5d9330698c29bb99fa77d053a00973b06af7c383c0a97545c3110ceeee9798a9171b0f4233246bd52db99ffe353ec65a2586da0fcc738c8b3b8
+  metadata.gz: 8bf5ac98b2a2945701453e84c48576ba6257a2be03109d5efa32dd1e4d1bb1d23abc57bb21f570798e8d919d19707ca8e71c2374aa53d3ea139e09a1a3804cbf
+  data.tar.gz: d4cdf8c1d1d0de0b9cc9e3b40112888a5b20f6053a7c5e7faca2895cd4db7d14a8d3b769246fe112ab7516ebe88e3a1d9d7df121acfeef4b62a98540cc1c4c35

data/lib/relation_to_struct/active_record_base_extension.rb

@@ -4,13 +4,24 @@ module RelationToStruct::ActiveRecordBaseExtension
   module ClassMethods
     def structs_from_sql(struct_class, sql, binds=[])
       result = connection.select_all(sanitize_sql(sql, nil), "Structs SQL Load", binds)
-      result.cast_values().map do |tuple|
-        struct_class.new(*tuple)
+
+      if result.columns.size != struct_class.members.size
+        raise ArgumentError, 'Expected struct fields and columns lengths to be equal'
+      end
+
+      if result.columns.size == 1
+        result.cast_values().map do |tuple|
+          struct_class.new(tuple)
+        end
+      else
+        result.cast_values().map do |tuple|
+          struct_class.new(*tuple)
+        end
       end
     end
 
     def pluck_from_sql(sql, binds=[])
-      result = connection.select_all(sanitize_sql(sql, nil), "Structs SQL Load", binds)
+      result = connection.select_all(sanitize_sql(sql, nil), "Pluck SQL Load", binds)
       result.cast_values()
     end
   end

data/lib/relation_to_struct/active_record_relation_extension.rb

@@ -6,10 +6,21 @@ module RelationToStruct::ActiveRecordRelationExtension
 
     relation = spawn
     result = klass.connection.select_all(relation.arel, nil, relation.arel.bind_values + bind_values)
+
+    if result.columns.size != struct_class.members.size
+      raise ArgumentError, 'Expected struct fields and columns lengths to be equal'
+    end
+
     result.cast_values(klass.column_types)
 
-    result.cast_values(klass.column_types).map do |tuple|
-      struct_class.new(*tuple)
+    if result.columns.size == 1
+      result.cast_values(klass.column_types).map do |tuple|
+        struct_class.new(tuple)
+      end
+    else
+      result.cast_values(klass.column_types).map do |tuple|
+        struct_class.new(*tuple)
+      end
     end
   end
 end

data/lib/relation_to_struct/version.rb

@@ -1,3 +1,3 @@
 module RelationToStruct
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/relation_to_struct_spec.rb

@@ -59,6 +59,28 @@ describe RelationToStruct do
       struct_column_klass = structs_results.first.date.class
       expect(pluck_column_klass).to eq(struct_column_klass)
     end
+
+    it '#to_structs should properly cast a single array column' do
+      Economist.create!(name: 'F.A. Hayek')
+
+      pluck_results = Economist.select('name').pluck('array[name]') rescue nil
+      if pluck_results
+        expect(pluck_results).to eq([['F.A. Hayek']]) # Verify ActiveRecord interface.
+
+        test_struct = Struct.new(:names)
+        structs_results = Economist.select('array[name]').to_structs(test_struct)
+        expect(structs_results.first.names).to eq(['F.A. Hayek'])
+      else
+        skip "DB selection doesn't support ARRAY[]"
+      end
+    end
+
+    it '#to_structs should raise an error when column count does not match struct size' do
+      expect do
+        test_struct = Struct.new(:id, :name, :extra_field)
+        Economist.select('id, name').to_structs(test_struct)
+      end.to raise_error(ArgumentError, 'Expected struct fields and columns lengths to be equal')
+    end
   end
 
   describe 'non-model specific querying' do
@@ -81,5 +103,28 @@ describe RelationToStruct do
       sql = "SELECT 1 * 23, 25"
       expect(ActiveRecord::Base.pluck_from_sql(sql)).to eq([[23, 25]])
     end
+
+    it 'structs_from_sql should properly cast a single array column' do
+      Economist.create!(name: 'F.A. Hayek')
+      Economist.create!(name: 'Ludwig von Mises')
+
+      pluck_results = Economist.select('name').order('id').limit(1).pluck('array[name]') rescue nil
+      if pluck_results
+        expect(pluck_results).to eq([['F.A. Hayek']]) # Verify ActiveRecord interface.
+
+        test_struct = Struct.new(:names)
+        structs_results = ActiveRecord::Base.structs_from_sql(test_struct, 'SELECT ARRAY_AGG(name ORDER BY id) FROM economists')
+        expect(structs_results.first.names).to eq(['F.A. Hayek', 'Ludwig von Mises'])
+      else
+        skip "DB selection doesn't support ARRAY[]"
+      end
+    end
+
+    it 'structs_from_sql should raise an error when column count does not match struct size' do
+      expect do
+        test_struct = Struct.new(:id, :name, :extra_field)
+        ActiveRecord::Base.structs_from_sql(test_struct, 'SELECT id, name FROM economists')
+      end.to raise_error(ArgumentError, 'Expected struct fields and columns lengths to be equal')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relation_to_struct
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - James Coleman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler