Merge pull request #137 from AMekss/fix_composite_primary_keys_test

Fix composite primary keys test

Author: ctran

spec/annotate/annotate_models_spec.rb

@@ -8,7 +8,7 @@ def mock_class(table_name, primary_key, columns)
     options = {
       :connection   => mock("Conn", :indexes => []),
       :table_name   => table_name,
-      :primary_key  => primary_key && primary_key.to_s,
+      :primary_key  => primary_key,
       :column_names => columns.map { |col| col.name.to_s },
       :columns      => columns
     }
@@ -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