Skip to content
This repository has been archived by the owner on Mar 30, 2022. It is now read-only.

Commit

Permalink
Fix a few typos in comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ernie committed Aug 27, 2012
1 parent ee2daf1 commit 1522192
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/squeel/adapters/active_record/3.0/relation_extensions.rb
Expand Up @@ -34,7 +34,7 @@ def join_dependency
# nemesis, Relation#merge would be it.
#
# Whatever code you see here currently is my current best attempt at
# coexisting peacefully with said nenesis.
# coexisting peacefully with said nemesis.
def merge(r, equalities_resolved = false)
if ::ActiveRecord::Relation === r && !equalities_resolved
if self.table_name != r.table_name
Expand Down Expand Up @@ -376,7 +376,7 @@ def debug_sql
# evil stuff with constant reassignment, all for the sake of
# being able to use super().
#
# 2. Submit a patch to Rails core, breaking these methods off into
# 2. Submit a patch to Rails core, breaking this method off into
# another module, all for my own selfish desire to use super()
# while mucking about in Rails internals.
#
Expand Down
4 changes: 2 additions & 2 deletions lib/squeel/adapters/active_record/3.1/relation_extensions.rb
Expand Up @@ -34,7 +34,7 @@ def join_dependency
# nemesis, Relation#merge would be it.
#
# Whatever code you see here currently is my current best attempt at
# coexisting peacefully with said nenesis.
# coexisting peacefully with said nemesis.
def merge(r, equalities_resolved = false)
if ::ActiveRecord::Relation === r && !equalities_resolved
if self.table_name != r.table_name
Expand Down Expand Up @@ -392,7 +392,7 @@ def debug_sql
# evil stuff with constant reassignment, all for the sake of
# being able to use super().
#
# 2. Submit a patch to Rails core, breaking these methods off into
# 2. Submit a patch to Rails core, breaking this method off into
# another module, all for my own selfish desire to use super()
# while mucking about in Rails internals.
#
Expand Down

0 comments on commit 1522192

Please sign in to comment.