ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add foreign keys part 16 

fixes CNVS-6202

Change-Id: If5b037b65c49b4722616a80e6438d65cda3dbf3a
Reviewed-on: https://gerrit.instructure.com/32042
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Rob Orton <rob@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2014-03-18 09:33:24 -06:00
parent 10aa2d8131
commit 045049036c
4 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
db/migrate/20140318150809_add_foreign_keys16.rb Normal file
View File

@ -0,0 +1,28 @@
class AddForeignKeys16 < ActiveRecord::Migration
tag :postdeploy
disable_ddl_transaction!
def self.up
add_foreign_key_if_not_exists :pseudonyms, :sis_batches, delay_validation: true
add_foreign_key_if_not_exists :accounts, :sis_batches, delay_validation: true
add_foreign_key_if_not_exists :enrollment_terms, :sis_batches, delay_validation: true
add_foreign_key_if_not_exists :abstract_courses, :sis_batches, delay_validation: true
add_foreign_key_if_not_exists :courses, :sis_batches, delay_validation: true
add_foreign_key_if_not_exists :course_sections, :sis_batches, delay_validation: true
add_foreign_key_if_not_exists :enrollments, :sis_batches, delay_validation: true
add_foreign_key_if_not_exists :groups, :sis_batches, delay_validation: true
add_foreign_key_if_not_exists :group_memberships, :sis_batches, delay_validation: true
end
def self.down
remove_foreign_key_if_exists :pseudonyms, :sis_batches
remove_foreign_key_if_exists :accounts, :sis_batches
remove_foreign_key_if_exists :enrollment_terms, :sis_batches
remove_foreign_key_if_exists :abstract_courses, :sis_batches
remove_foreign_key_if_exists :courses, :sis_batches
remove_foreign_key_if_exists :course_sections, :sis_batches
remove_foreign_key_if_exists :enrollments, :sis_batches
remove_foreign_key_if_exists :groups, :sis_batches
remove_foreign_key_if_exists :group_memberships, :sis_batches
end
end

1
spec/factories/course_factory.rb
View File

@ -44,7 +44,6 @@ def course_valid_attributes
:conclude_at => Time.now + 100, :conclude_at => Time.now + 100,
:is_public => true, :is_public => true,
:allow_student_wiki_edits => true, :allow_student_wiki_edits => true,
:sis_batch_id => 1,
} }
end end

3
spec/models/group_membership_spec.rb
View File

@ -110,7 +110,8 @@ describe GroupMembership do
@course.enroll_student(student).accept! @course.enroll_student(student).accept!
Notification.create!(name: 'New Context Group Membership', category: 'TestImmediately') Notification.create!(name: 'New Context Group Membership', category: 'TestImmediately')
Notification.create!(name: 'New Context Group Membership Invitation', category: 'TestImmediately') Notification.create!(name: 'New Context Group Membership Invitation', category: 'TestImmediately')
membership.sis_batch_id = '12345' batch = @course.root_account.sis_batches.create!
membership.sis_batch_id = batch.id
membership.save! membership.save!
membership.messages_sent.should be_empty membership.messages_sent.should be_empty
end end

7
vendor/plugins/account_reports/spec_canvas/sis_provisioning_reports_spec.rb vendored
View File

@ -224,16 +224,17 @@ describe "Default Account Reports" do
def create_some_group_memberships_n_stuff() def create_some_group_memberships_n_stuff()
create_some_users_with_pseudonyms() create_some_users_with_pseudonyms()
create_some_groups() create_some_groups()
batch = @group1.root_account.sis_batches.create!
@gm1 = GroupMembership.create(:group => @group1,:user => @user1,:workflow_state => "accepted") @gm1 = GroupMembership.create(:group => @group1,:user => @user1,:workflow_state => "accepted")
@gm1.sis_batch_id = 1 @gm1.sis_batch_id = batch.id
@gm1.save! @gm1.save!
@gm2 = GroupMembership.create(:group => @group2,:user => @user2,:workflow_state => "accepted") @gm2 = GroupMembership.create(:group => @group2,:user => @user2,:workflow_state => "accepted")
@gm2.sis_batch_id = 1 @gm2.sis_batch_id = batch.id
@gm2.save! @gm2.save!
@gm3 = GroupMembership.create(:group => @group3,:user => @user3,:workflow_state => "accepted") @gm3 = GroupMembership.create(:group => @group3,:user => @user3,:workflow_state => "accepted")
@gm3.save! @gm3.save!
@gm4 = GroupMembership.create(:group => @group2,:user => @user3,:workflow_state => "accepted") @gm4 = GroupMembership.create(:group => @group2,:user => @user3,:workflow_state => "accepted")
@gm4.sis_batch_id = 1 @gm4.sis_batch_id = batch.id
@gm4.save! @gm4.save!
@gm4.destroy @gm4.destroy
end end