Skip to content

Commit e2eeb65

Browse files
Merge pull request #10 from wpolicarpo/fix-fixtures-tests
Fix Fixtures tests
2 parents f3fc912 + b03eb97 commit e2eeb65

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

lib/active_record/connection_adapters/sqlserver/database_statements.rb

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -84,28 +84,22 @@ def can_perform_case_insensitive_comparison_for?(column)
8484
end
8585
private :can_perform_case_insensitive_comparison_for?
8686

87-
# === SQLServer Specific ======================================== #
88-
89-
90-
def insert_fixtures_set(fixture_set, tables_to_delete = [])
91-
fixture_inserts = fixture_set.map do |table_name, fixtures|
92-
next if fixtures.empty?
93-
94-
build_fixture_sql(fixtures, table_name)
95-
end.compact
96-
97-
table_deletes = tables_to_delete.map { |table| "DELETE FROM #{quote_table_name table}".dup }
98-
sql_statements = table_deletes + fixture_inserts
87+
def combine_multi_statements(total_sql)
88+
total_sql
89+
end
90+
private :combine_multi_statements
9991

100-
disable_referential_integrity do
101-
transaction(requires_new: true) do
102-
sql_statements.each do |sql|
103-
execute sql, "Fixtures Load"
104-
yield if block_given?
105-
end
106-
end
92+
def default_insert_value(column)
93+
if column.is_identity?
94+
table_name = quote(quote_table_name(column.table_name))
95+
Arel.sql("IDENT_CURRENT(#{table_name}) + IDENT_INCR(#{table_name})")
96+
else
97+
super
10798
end
10899
end
100+
private :default_insert_value
101+
102+
# === SQLServer Specific ======================================== #
109103

110104
def execute_procedure(proc_name, *variables)
111105
vars = if variables.any? && variables.first.is_a?(Hash)

0 commit comments

Comments
 (0)