提交 2bce5adf 编写于 作者: R Ryuta Kamizono

Refactor `connection.insert_sql`

`connection.insert_sql` is almost the same as `connection.insert`.
上级 cc58837f
......@@ -115,9 +115,7 @@ def exec_update(sql, name, binds)
# If the next id was calculated in advance (as in Oracle), it should be
# passed in as +id_value+.
def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
sql, binds = sql_for_insert(to_sql(arel, binds), pk, id_value, sequence_name, binds)
value = exec_insert(sql, name, binds, pk, sequence_name)
id_value || last_inserted_id(value)
insert_sql(to_sql(arel, binds), name, pk, id_value, sequence_name, binds)
end
alias create insert
......@@ -352,6 +350,13 @@ def join_to_update(update, select, key) # :nodoc:
end
alias join_to_delete join_to_update
# Executes an INSERT query and returns the new record's ID
def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
sql, binds = sql_for_insert(sql, pk, id_value, sequence_name, binds)
value = exec_insert(sql, name, binds, pk, sequence_name)
id_value || last_inserted_id(value)
end
protected
# Returns a subquery for the given key using the join information.
......@@ -370,12 +375,6 @@ def select_prepared(sql, name = nil, binds = [])
exec_query(sql, name, binds, prepare: true)
end
# Returns the last auto-generated ID from the affected table.
def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
execute(sql, name)
id_value
end
# Executes the update statement and returns the number of rows affected.
def update_sql(sql, name = nil)
execute(sql, name)
......
......@@ -136,11 +136,6 @@ def exec_query(sql, name = 'SQL', binds = [], prepare: false)
alias exec_without_stmt exec_query
def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
super
id_value || @connection.last_id
end
def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
execute to_sql(sql, binds), name
end
......
......@@ -73,21 +73,13 @@ def select_rows(sql, name = nil, binds = [])
end
# Executes an INSERT query and returns the new record's ID
def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = []) # :nodoc:
unless pk
# Extract the table from the insert sql. Yuck.
table_ref = extract_table_ref_from_insert_sql(sql)
pk = primary_key(table_ref) if table_ref
end
if pk && use_insert_returning?
select_value("#{sql} RETURNING #{quote_column_name(pk)}")
elsif pk
super
last_insert_id_value(sequence_name || default_sequence_name(table_ref, pk))
else
super
end
super
end
# The internal PostgreSQL identifier of the money data type.
......@@ -171,12 +163,6 @@ def exec_delete(sql, name = 'SQL', binds = [])
alias :exec_update :exec_delete
def sql_for_insert(sql, pk, id_value, sequence_name, binds)
unless pk
# Extract the table from the insert sql. Yuck.
table_ref = extract_table_ref_from_insert_sql(sql)
pk = primary_key(table_ref) if table_ref
end
if pk && use_insert_returning?
sql = "#{sql} RETURNING #{quote_column_name(pk)}"
end
......
......@@ -290,11 +290,6 @@ def delete_sql(sql, name = nil) #:nodoc:
super sql, name
end
def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil) #:nodoc:
super
id_value || @connection.last_insert_row_id
end
def select_rows(sql, name = nil, binds = [])
exec_query(sql, name, binds).rows
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册