Merge pull request rails#9204 from ranjaykrishna/col-prob

schema dumper tests now conducted by ActiveRecord::Base.Connection

Author: tenderlove

activerecord/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -326,6 +326,10 @@ def translate_exception(exception, message)
         # override in derived class
         ActiveRecord::StatementInvalid.new(message)
       end
+
+      def valid_types?(type)
+        true
+      end
     end
   end
 end

activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -748,6 +748,9 @@ def configure_connection
         execute("SET #{encoding} #{variable_assignments}", :skip_logging)
       end
 
+      def valid_type?(type)
+        !native_database_types[type].nil?
+      end  
     end
   end
 end

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -887,6 +887,10 @@ def extract_table_ref_from_insert_sql(sql)
         def table_definition
           TableDefinition.new(self)
         end
+
+        def valid_type?(type)
+          !native_database_types[type].nil?
+        end
     end
   end
 end

activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb

@@ -603,6 +603,10 @@ def translate_exception(exception, message)
           end
         end
 
+        def valid_type?(type)
+          true
+        end
+
     end
   end
 end

activerecord/lib/active_record/schema_dumper.rb

@@ -118,7 +118,7 @@ def table(table, stream)
 
           # then dump all non-primary key columns
           column_specs = columns.map do |column|
-            raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" if @types[column.type].nil?
+            raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" unless @connection.valid_type?(column.type)
             next if column.name == pk
             @connection.column_spec(column, @types)
           end.compact

activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

@@ -16,6 +16,15 @@ def setup
         eosql
       end
 
+      def test_valid_column
+        column = @conn.column('ex').find { |col| col.name == 'id' }
+        assert @conn.valid_type?(column.type)
+      end
+
+      def test_invalid_column
+        assert !@conn.valid_type?(:foobar)
+      end
+
       def test_client_encoding
         assert_equal Encoding::UTF_8, @conn.client_encoding
       end

activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb

@@ -10,6 +10,15 @@ def setup
         @connection.exec_query('create table ex(id serial primary key, number integer, data character varying(255))')
       end
 
+      def test_valid_column
+        column = @connection.column('ex').find { |col| col.name == 'id' }
+        assert @connection.valid_type?(column.type)
+      end
+
+      def test_invalid_column
+        assert !@connection.valid_type?(:foobar)
+      end
+
       def test_primary_key
         assert_equal 'id', @connection.primary_key('ex')
       end

activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb

@@ -25,6 +25,15 @@ def setup
         @conn.intercepted = true
       end
 
+      def test_valid_column
+        column = @conn.column('items').find { |col| col.name == 'id' }
+        assert @conn.valid_type?(column.type)
+      end
+
+      def test_invalid_column
+        assert @conn.valid_type?(:foobar)
+      end
+
       def teardown
         @conn.intercepted = false
         @conn.logged = []