Commit 1362ec7

authored

Merge pull request #51 from simi/do-not-load-association

Do not load association during initialization of cursor.

2 parents 1c19034 + b370459 commit 1362ec7Copy full SHA for 1362ec7

File tree

+18

-3

lines changed

+18

-3

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,5 @@ desc "Setup testing database and table"`
`21`	`21`	`task :setup do`
`22`	`22`	`sh %q(createdb postgresql_cursor_test)`
`23`	`23`	`sh %Q<echo "create table products ( id serial primary key, data varchar);" \| psql postgresql_cursor_test>`
	`24`	`+ sh %Q<echo "create table prices ( id serial primary key, data varchar, product_id integer);" \| psql postgresql_cursor_test>`
`24`	`25`	`end`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,14 @@ def initialize(sql, options={})`
`50`	`50`	`@batched = false`
`51`	`51`	`end`
`52`	`52`
`53`		`- # Specify the type to instantiate, or reset to return a Hash`
	`53`	`+ # Specify the type to instantiate, or reset to return a Hash.`
	`54`	`+ #`
	`55`	`+ # Explicitly check for type class to prevent calling equality`
	`56`	`+ # operator on active record relation, which will load it.`
`54`	`57`	`def iterate_type(type=nil)`
`55`		`- if type.nil? \|\| type == Hash`
	`58`	`+ if type.nil? \|\| (type.class == Class && type == Hash)`
`56`	`59`	`@iterate = :each_row`
`57`		`- elsif type == Array`
	`60`	`+ elsif type.class == Class && type == Array`
`58`	`61`	`@iterate = :each_array`
`59`	`62`	`else`
`60`	`63`	`@iterate = :each_instance`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`	`username: ENV['TEST_USER'] \|\| ENV['USER'] \|\| 'postgresql_cursor')`
`11`	`11`
`12`	`12`	`class Product < ActiveRecord::Base`
	`13`	`+ has_many :prices`
	`14`	`+`
`13`	`15`	`# create table records (id serial primary key);`
`14`	`16`	`def self.generate(max=1_000)`
`15`	`17`	`max.times do \|i\|`
`@@ -18,5 +20,9 @@ def self.generate(max=1_000)`
`18`	`20`	`end`
`19`	`21`	`end`
`20`	`22`
	`23`	`+class Price < ActiveRecord::Base`
	`24`	`+ belongs_to :product`
	`25`	`+end`
	`26`	`+`
`21`	`27`	`Product.destroy_all`
`22`	`28`	`Product.generate(1000)`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -191,4 +191,9 @@ def test_bad_sql`
`191`	`191`	`assert_match(/bad_table/, e.message)`
`192`	`192`	`end`
`193`	`193`	`end`
	`194`	`+`
	`195`	`+ def test_relation_association_is_not_loaded`
	`196`	`+ cursor = Product.first.prices.each_instance`
	`197`	`+ refute cursor.instance_variable_get(:@type).loaded?`
	`198`	`+ end`
`194`	`199`	`end`

Comments

(0)