Merge pull request #105 from garysweaver/master

lib/annotate/annotate_models.rb

@@ -113,7 +113,7 @@ module AnnotateModels
         attrs = []
         attrs << "default(#{quote(col.default)})" unless col.default.nil?
         attrs << "not null" unless col.null
-        attrs << "primary key" if klass.primary_key && col.name.to_sym == klass.primary_key.to_sym
+        attrs << "primary key" if klass.primary_key && (klass.primary_key.is_a?(Array) ? klass.primary_key.collect{|c|c.to_sym}.include?(col.name.to_sym) : col.name.to_sym == klass.primary_key.to_sym)
 
         col_type = (col.type || col.sql_type).to_s
         if col_type == "decimal"

spec/annotate/annotate_models_spec.rb

@@ -73,6 +73,25 @@ EOS
 EOS
   end
 
+  it "should get schema info even if the primary key is array, if using composite_primary_keys" do
+    klass = mock_class(:users, nil, [
+                                     [mock_column(:a_id, :integer), mock_column(:b_id, :integer)],
+                                     mock_column(:name, :string, :limit => 50)
+                                    ])
+
+    AnnotateModels.get_schema_info(klass, "Schema Info").should eql(<<-EOS)
+# Schema Info
+#
+# Table name: users
+#
+#  a_id   :integer        not null
+#  b_id   :integer        not null
+#  name :string(50)       not null
+#
+
+EOS
+  end
+
   it "should get schema info as RDoc" do
     klass = mock_class(:users, :id, [
                                      mock_column(:id, :integer),