From c65b076328b292f1b727bb6a7dc144c05458163f Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 15 Feb 2013 16:19:08 +0000 Subject: Revert "checking in the abstractions for valid type checking:" This reverts commit c321b309a9a90bbfa0912832c11b3fef52e71840. Conflicts: activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb Reason: failing test 1) Error: test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest): NoMethodError: undefined method `column' for test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in `test_valid_column' --- activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb | 9 --------- .../test/cases/adapters/postgresql/postgresql_adapter_test.rb | 9 --------- activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb | 9 --------- 3 files changed, 27 deletions(-) (limited to 'activerecord/test') diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb index 0b017dc4a0..0eb1cc511e 100644 --- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb +++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb @@ -16,15 +16,6 @@ module ActiveRecord 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 diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb index d33e360bd4..872204c644 100644 --- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb +++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb @@ -10,15 +10,6 @@ module ActiveRecord @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 diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb index 64af49acec..003052bac4 100644 --- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb +++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb @@ -25,15 +25,6 @@ module ActiveRecord @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 = [] -- cgit v1.2.3