Fix: assertion and test for composite_primary_keys

Artūrs Mekšs · Artūrs Mekšs · commit 8f958f4310a2 · 2013-08-21T12:48:36.000+03:00
diff --git a/spec/annotate/annotate_models_spec.rb b/spec/annotate/annotate_models_spec.rb
@@ -72,7 +72,7 @@ def mock_column(name, type, options={})
   end
 
   it "should get schema info even if the primary key is array, if using composite_primary_keys" do
-    klass = mock_class(:users, nil, [
+    klass = mock_class(:users, [:a_id, :b_id], [
                                      mock_column(:a_id, :integer),
                                      mock_column(:b_id, :integer),
                                      mock_column(:name, :string, :limit => 50)
@@ -83,8 +83,8 @@ def mock_column(name, type, options={})
 #
 # Table name: users
 #
-#  a_id :integer          not null
-#  b_id :integer          not null
+#  a_id :integer          not null, primary key
+#  b_id :integer          not null, primary key
 #  name :string(50)       not null
 #
 EOS

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ def mock_column(name, type, options={})`
`72`	`72`	`end`
`73`	`73`
`74`	`74`	`it "should get schema info even if the primary key is array, if using composite_primary_keys" do`
`75`		`- klass = mock_class(:users, nil, [`
	`75`	`+ klass = mock_class(:users, [:a_id, :b_id], [`
`76`	`76`	`mock_column(:a_id, :integer),`
`77`	`77`	`mock_column(:b_id, :integer),`
`78`	`78`	`mock_column(:name, :string, :limit => 50)`
`@@ -83,8 +83,8 @@ def mock_column(name, type, options={})`
`83`	`83`	`#`
`84`	`84`	`# Table name: users`
`85`	`85`	`#`
`86`		`-# a_id :integer not null`
`87`		`-# b_id :integer not null`
	`86`	`+# a_id :integer not null, primary key`
	`87`	`+# b_id :integer not null, primary key`
`88`	`88`	`# name :string(50) not null`
`89`	`89`	`#`
`90`	`90`	`EOS`