Skip to content

Return the result of calling the super implementation. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2015
Merged

Return the result of calling the super implementation. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions lib/schema_plus/core/active_record/base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,29 @@ def reset_column_information
def has_many(name, scope = nil, options = {}, &extension)
SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do
|env|
super(env.name, env.scope, env.options, &env.extension)
end
env.result = super(env.name, env.scope, env.options, &env.extension)
end.result
end

def has_one(name, scope = nil, options = {}, &extension)
SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do
|env|
super(env.name, env.scope, env.options, &env.extension)
end
env.result = super(env.name, env.scope, env.options, &env.extension)
end.result
end

def has_and_belongs_to_many(name, scope = nil, options = {}, &extension)
SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do
|env|
super(env.name, env.scope, env.options, &env.extension)
end
env.result = super(env.name, env.scope, env.options, &env.extension)
end.result
end

def belongs_to(name, scope = nil, options = {}, &extension)
SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do
|env|
super(env.name, env.scope, env.options, &env.extension)
end
env.result = super(env.name, env.scope, env.options, &env.extension)
end.result
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/schema_plus/core/middleware.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ module ResetColumnInformation
end
module Association
module Declaration
ENV = [:model, :name, :scope, :options, :extension]
ENV = [:model, :name, :scope, :options, :extension, :result]
end
end
end
Expand Down