Skip to content

Commit ea1bd82

Browse files
committed
Fixing disable referential integrity tests.
1 parent 15e1584 commit ea1bd82

File tree

6 files changed

+21
-19
lines changed

6 files changed

+21
-19
lines changed

test/cases/adapter_test_sqlserver.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,23 +230,23 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
230230
describe 'disabling referential integrity' do
231231

232232
before do
233-
connection.disable_referential_integrity { FkTestHasPk.delete_all; FkTestHasFk.delete_all }
234-
@parent = FkTestHasPk.create!
235-
@member = FkTestHasFk.create!(fk_id: @parent.id)
233+
connection.disable_referential_integrity { SSTestHasPk.delete_all; SSTestHasFk.delete_all }
234+
@parent = SSTestHasPk.create!
235+
@member = SSTestHasFk.create!(fk_id: @parent.id)
236236
end
237237

238238
it 'NOT ALLOW by default the deletion of a referenced parent' do
239-
FkTestHasPk.connection.disable_referential_integrity { }
239+
SSTestHasPk.connection.disable_referential_integrity { }
240240
assert_raise(ActiveRecord::StatementInvalid) { @parent.destroy }
241241
end
242242

243243
it 'ALLOW deletion of referenced parent using #disable_referential_integrity block' do
244-
FkTestHasPk.connection.disable_referential_integrity { @parent.destroy }
244+
SSTestHasPk.connection.disable_referential_integrity { @parent.destroy }
245245
end
246246

247247
it 'again NOT ALLOW deletion of referenced parent after #disable_referential_integrity block' do
248248
assert_raise(ActiveRecord::StatementInvalid) do
249-
FkTestHasPk.connection.disable_referential_integrity { }
249+
SSTestHasPk.connection.disable_referential_integrity { }
250250
@parent.destroy
251251
end
252252
end

test/models/fk_test_has_fk.rb

Lines changed: 0 additions & 2 deletions
This file was deleted.

test/models/fk_test_has_pk.rb

Lines changed: 0 additions & 2 deletions
This file was deleted.

test/models/sqlserver/fk_has_fk.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class SSTestHasFk < ActiveRecord::Base
2+
self.table_name = 'sst_has_fks'
3+
end

test/models/sqlserver/fk_has_pk.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
class SSTestHasPk < ActiveRecord::Base
2+
self.table_name = 'sst_has_pks'
3+
end

test/schema/sqlserver_specific_schema.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@
1111
t.column :COLUMN2, :integer
1212
end
1313

14+
create_table(:sst_has_fks, force: true) { |t| t.column(:fk_id, :integer, null: false) }
15+
create_table(:sst_has_pks, force: true) { }
16+
execute <<-ADDFKSQL
17+
ALTER TABLE sst_has_fks
18+
ADD CONSTRAINT FK__sst_has_fks_id
19+
FOREIGN KEY ([fk_id])
20+
REFERENCES [sst_has_pks] ([id])
21+
ADDFKSQL
22+
1423

1524

1625

@@ -47,15 +56,6 @@
4756
t.column :smalldatetime, :smalldatetime
4857
end
4958

50-
create_table(:fk_test_has_fks, force: true) { |t| t.column(:fk_id, :integer, null: false) }
51-
create_table(:fk_test_has_pks, force: true) { }
52-
execute <<-ADDFKSQL
53-
ALTER TABLE fk_test_has_fks
54-
ADD CONSTRAINT FK__fk_test_has_fk_fk_id
55-
FOREIGN KEY (#{quote_column_name('fk_id')})
56-
REFERENCES #{quote_table_name('fk_test_has_pks')} (#{quote_column_name('id')})
57-
ADDFKSQL
58-
5959
create_table :sql_server_unicodes, force: true do |t|
6060
t.column :nchar, :nchar
6161
t.column :nvarchar, :nvarchar

0 commit comments

Comments
 (0)