annotate bigint correctly

lib/annotate/annotate_models.rb

@@ -249,7 +249,7 @@ def get_schema_info(klass, header, options = {})
       cols = cols.sort_by(&:name) if options[:sort]
       cols = classified_sort(cols) if options[:classified_sort]
       cols.each do |col|
-        col_type = (col.type || col.sql_type).to_s
+        col_type = get_col_type(col)
         attrs = []
         attrs << "default(#{schema_default(klass, col)})" unless col.default.nil? || hide_default?(col_type, options)
         attrs << 'unsigned' if col.respond_to?(:unsigned?) && col.unsigned?
@@ -363,6 +363,14 @@ def get_index_info(klass, options = {})
       index_info
     end
 
+    def get_col_type(col)
+      if col.respond_to?(:bigint?) && col.bigint?
+        'bigint'
+      else
+        (col.type || col.sql_type).to_s
+      end
+    end
+
     def index_columns_info(index)
       Array(index.columns).map do |col|
         if index.try(:orders) && index.orders[col.to_s]

spec/annotate/annotate_models_spec.rb

@@ -157,7 +157,7 @@ def mock_column(name, type, options = {})
                        [
                          mock_column(:id, :integer),
                          mock_column(:integer, :integer, unsigned?: true),
-                         mock_column(:bigint,  :bigint,  unsigned?: true),
+                         mock_column(:bigint,  :integer, unsigned?: true, bigint?: true),
                          mock_column(:float,   :float,   unsigned?: true),
                          mock_column(:decimal, :decimal, unsigned?: true, precision: 10, scale: 2),
                        ])