Commit 7e8dd76

authored

Merge pull request #48 from adwyze/fix-enum-parsing

FIX #40: Handle enum attributes while instantiating rows

2 parents 43e7f36 + c6080e1 commit 7e8dd76Copy full SHA for 7e8dd76

File tree

-12

lines changed

-12

lines changed

Lines changed: 2 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,7 @@ def each_array(&block)`
`110`	`110`	`def each_instance(klass=nil, &block)`
`111`	`111`	`klass \|\|= @type`
`112`	`112`	`self.each_tuple do \|row\|`
`113`		`- if ::ActiveRecord::VERSION::MAJOR < 4`
`114`		`- model = klass.send(:instantiate,row)`
`115`		`- else`
`116`		`- @column_types \|\|= column_types`
`117`		`- model = klass.send(:instantiate, row, @column_types)`
`118`		`- end`
	`113`	`+ klass.send(:instantiate, row)`
`119`	`114`	`block.call(model)`
`120`	`115`	`end`
`121`	`116`	`end`
`@@ -144,12 +139,7 @@ def each_instance_batch(klass=nil, &block)`
`144`	`139`	`klass \|\|= @type`
`145`	`140`	`self.each_batch do \|batch\|`
`146`	`141`	`models = batch.map do \|row\|`
`147`		`- if ::ActiveRecord::VERSION::MAJOR < 4`
`148`		`- model = klass.send(:instantiate, row)`
`149`		`- else`
`150`		`- @column_types \|\|= column_types`
`151`		`- model = klass.send(:instantiate, row, @column_types)`
`152`		`- end`
	`142`	`+ klass.send(:instantiate, row)`
`153`	`143`	`end`
`154`	`144`	`block.call(models)`
`155`	`145`	`end`

Comments

(0)