Title: [690] trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mssql.rb: Fix SQL Server inserts, by Weijie Lin
- Revision
- 690
- Author
- olabini
- Date
- 2007-08-17 12:40:41 -0400 (Fri, 17 Aug 2007)
Log Message
Fix SQL Server inserts, by Weijie Lin
Modified Paths
Diff
Modified: trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mssql.rb (689 => 690)
--- trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mssql.rb 2007-08-17 16:37:31 UTC (rev 689)
+++ trunk/activerecord-jdbc/lib/jdbc_adapter/jdbc_mssql.rb 2007-08-17 16:40:41 UTC (rev 690)
@@ -225,16 +225,21 @@
end
def _execute(sql, name = nil)
- if sql.lstrip =~ /^INSERT/i && (table_name = query_requires_identity_insert?(sql))
- with_identity_insert_enabled(table_name) do
- @connection.execute_insert(sql)
- end
- elsif sql.lstrip =~ /^\(?\s*(select|show)/i
- @connection.execute_query(sql)
- else
- @connection.execute_update(sql)
+ if sql.lstrip =~ /^insert/i
+ if query_requires_identity_insert?(sql)
+ table_name = get_table_name(sql)
+ with_identity_insert_enabled(table_name) do
+ id = @connection.execute_insert(sql)
end
+ else
+ @connection.execute_insert(sql)
+ end
+ elsif sql.lstrip =~ /^\(?\s*(select|show)/i
+ @connection.execute_query(sql)
+ else
+ @connection.execute_update(sql)
end
+ end
private
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
