diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-28 15:42:47 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-09-28 15:42:47 -0700 |
commit | 110f8f145c93fc1975dcaa03db1a908a7d1b823b (patch) | |
tree | a212cf53ebb87f79e782c77ad63585987bace78f /lib | |
parent | 31e3033ed9059577e60a8e25962f55bc4a918fd7 (diff) | |
parent | 6f8c4f183d47bcc36fc30230bb55f90e59a98a37 (diff) | |
download | rails-110f8f145c93fc1975dcaa03db1a908a7d1b823b.tar.gz rails-110f8f145c93fc1975dcaa03db1a908a7d1b823b.tar.bz2 rails-110f8f145c93fc1975dcaa03db1a908a7d1b823b.zip |
Merge branch 'master' of github.com:brynary/arel
* 'master' of github.com:brynary/arel:
added missing method visit_Arel_Attributes_Decimal as alias for visit_Arel_Attributes_Attribute
pass primary key name and value to ActiveRecord adapter insert method
Diffstat (limited to 'lib')
-rw-r--r-- | lib/arel/select_manager.rb | 12 | ||||
-rw-r--r-- | lib/arel/table.rb | 6 | ||||
-rw-r--r-- | lib/arel/visitors/to_sql.rb | 1 |
3 files changed, 16 insertions, 3 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb index 21b9395120..77930a6bb1 100644 --- a/lib/arel/select_manager.rb +++ b/lib/arel/select_manager.rb @@ -163,9 +163,17 @@ module Arel # FIXME: this method should go away def insert values im = InsertManager.new @engine - im.into @ctx.froms + table = @ctx.froms + primary_key_name = (primary_key = table.primary_key) && primary_key.name + # FIXME: in AR tests values sometimes were Array and not Hash therefore is_a?(Hash) check is added + primary_key_value = primary_key && values.is_a?(Hash) && values[primary_key] + im.into table im.insert values - @engine.connection.insert im.to_sql + # Oracle adapter needs primary key name to generate RETURNING ... INTO ... clause + # for tables which assign primary key value using trigger. + # RETURNING ... INTO ... clause will be added only if primary_key_value is nil + # therefore it is necessary to pass primary key value as well + @engine.connection.insert im.to_sql, 'AREL', primary_key_name, primary_key_value end private diff --git a/lib/arel/table.rb b/lib/arel/table.rb index ba31e3183b..3285037154 100644 --- a/lib/arel/table.rb +++ b/lib/arel/table.rb @@ -27,7 +27,11 @@ module Arel end def primary_key - @primary_key ||= self[@engine.connection.primary_key(name)] + @primary_key ||= begin + primary_key_name = @engine.connection.primary_key(name) + # some tables might be without primary key + primary_key_name && self[primary_key_name] + end end def alias diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index 274a491f78..fc821a0ddb 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -234,6 +234,7 @@ module Arel "#{quote_table_name join_name}.#{quote_column_name o.name}" end alias :visit_Arel_Attributes_Integer :visit_Arel_Attributes_Attribute + alias :visit_Arel_Attributes_Decimal :visit_Arel_Attributes_Attribute alias :visit_Arel_Attributes_String :visit_Arel_Attributes_Attribute alias :visit_Arel_Attributes_Time :visit_Arel_Attributes_Attribute alias :visit_Arel_Attributes_Boolean :visit_Arel_Attributes_Attribute |