Skip to content
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

Add support for ActiveRecord 4.x #1

Merged
merged 2 commits into from
Feb 24, 2014
Merged

Add support for ActiveRecord 4.x #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8959107
patch per recommendation on github issue
brendandc Feb 20, 2014
a0c478d
more changes to uuid.rb from PR on main repo for AR 4.0 support
brendandc Feb 21, 2014
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
2 changes: 1 addition & 1 deletion lib/activeuuid/patches.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module Migrations
def uuid(*column_names)
options = column_names.extract_options!
column_names.each do |name|
type = @base.adapter_name.downcase == 'postgresql' ? 'uuid' : 'binary(16)'
type = ActiveRecord::Base.connection.adapter_name.downcase == 'postgresql' ? 'uuid' : 'binary(16)'
column(name, "#{type}#{' PRIMARY KEY' if options.delete(:primary_key)}", options)
end
end
Expand Down
18 changes: 9 additions & 9 deletions lib/activeuuid/uuid.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,26 @@ def self.parse_string(str)
module Arel
module Visitors
class DepthFirst < Arel::Visitors::Visitor
def visit_UUIDTools_UUID(o)
o.quoted_id
def visit_UUIDTools_UUID(object, attribute)
object.quoted_id
end
end

class MySQL < Arel::Visitors::ToSql
def visit_UUIDTools_UUID(o)
o.quoted_id
def visit_UUIDTools_UUID(object, attribute)
object.quoted_id
end
end

class SQLite < Arel::Visitors::ToSql
def visit_UUIDTools_UUID(o)
o.quoted_id
def visit_UUIDTools_UUID(object, attribute)
object.quoted_id
end
end

class PostgreSQL < Arel::Visitors::ToSql
def visit_UUIDTools_UUID(o)
"'#{o.to_s}'"
def visit_UUIDTools_UUID(object, attribute)
"'#{object.to_s}'"
end
end
end
Expand Down Expand Up @@ -114,7 +114,7 @@ def uuids(*attributes)
EOS
end

def instantiate_with_uuid(record)
def instantiate_with_uuid(record, column_types)
uuid_columns.each do |uuid_column|
record[uuid_column] = UUIDTools::UUID.serialize(record[uuid_column]).to_s if record[uuid_column]
end
Expand Down