aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-01-01 00:00:00 -0800
committerRyuta Kamizono <kamipo@gmail.com>2015-01-04 07:32:03 +0900
commit3225ebfa0632cd42a0fbcf0cbca36c7c06e54844 (patch)
tree67a4a7cf8d75aa5648f9fea21ab40be75705ec97 /activerecord/test
parent4591b0fc041454f4ba4a83629b9bbca2a851969c (diff)
downloadrails-3225ebfa0632cd42a0fbcf0cbca36c7c06e54844.tar.gz
rails-3225ebfa0632cd42a0fbcf0cbca36c7c06e54844.tar.bz2
rails-3225ebfa0632cd42a0fbcf0cbca36c7c06e54844.zip
Prefer `array?` rather than `array`
Slightly refactoring `PostgreSQLColumn`. `array` should be readonly. `default_function` should be initialized by `super`. `sql_type` has been removed `[]`. Since we already choose to remove it we should not change.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/adapters/postgresql/array_test.rb6
-rw-r--r--activerecord/test/cases/adapters/postgresql/bit_string_test.rb4
-rw-r--r--activerecord/test/cases/adapters/postgresql/citext_test.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/composite_test.rb4
-rw-r--r--activerecord/test/cases/adapters/postgresql/domain_test.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/enum_test.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/full_text_test.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/geometric_test.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/hstore_test.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/json_test.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/ltree_test.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/money_test.rb2
-rw-r--r--activerecord/test/cases/adapters/postgresql/network_test.rb6
-rw-r--r--activerecord/test/cases/adapters/postgresql/uuid_test.rb2
-rw-r--r--activerecord/test/cases/migration/change_schema_test.rb4
15 files changed, 22 insertions, 22 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 042beab23f..77055f5b7a 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -35,13 +35,13 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
def test_column
assert_equal :string, @column.type
assert_equal "character varying", @column.sql_type
- assert @column.array
+ assert @column.array?
assert_not @column.number?
assert_not @column.binary?
ratings_column = PgArray.columns_hash['ratings']
assert_equal :integer, ratings_column.type
- assert ratings_column.array
+ assert ratings_column.array?
assert_not ratings_column.number?
end
@@ -74,7 +74,7 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
assert_equal :text, column.type
assert_equal [], PgArray.column_defaults['snippets']
- assert column.array
+ assert column.array?
end
def test_change_column_cant_make_non_array_column_to_array
diff --git a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
index 72222c01fd..f154ba4cdc 100644
--- a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
@@ -28,7 +28,7 @@ class PostgresqlBitStringTest < ActiveRecord::TestCase
assert_equal "bit(8)", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_bit_string_varying_column
@@ -37,7 +37,7 @@ class PostgresqlBitStringTest < ActiveRecord::TestCase
assert_equal "bit varying(4)", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_default
diff --git a/activerecord/test/cases/adapters/postgresql/citext_test.rb b/activerecord/test/cases/adapters/postgresql/citext_test.rb
index 85bff979c9..5a8083f7a7 100644
--- a/activerecord/test/cases/adapters/postgresql/citext_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/citext_test.rb
@@ -34,7 +34,7 @@ if ActiveRecord::Base.connection.supports_extensions?
assert_equal 'citext', column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_change_table_supports_json
diff --git a/activerecord/test/cases/adapters/postgresql/composite_test.rb b/activerecord/test/cases/adapters/postgresql/composite_test.rb
index cfab5ca902..24c1969dee 100644
--- a/activerecord/test/cases/adapters/postgresql/composite_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/composite_test.rb
@@ -52,7 +52,7 @@ class PostgresqlCompositeTest < ActiveRecord::TestCase
assert_equal "full_address", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_composite_mapping
@@ -113,7 +113,7 @@ class PostgresqlCompositeWithCustomOIDTest < ActiveRecord::TestCase
assert_equal "full_address", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_composite_mapping
diff --git a/activerecord/test/cases/adapters/postgresql/domain_test.rb b/activerecord/test/cases/adapters/postgresql/domain_test.rb
index 1500adb42d..ebb04814bb 100644
--- a/activerecord/test/cases/adapters/postgresql/domain_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/domain_test.rb
@@ -31,7 +31,7 @@ class PostgresqlDomainTest < ActiveRecord::TestCase
assert_equal "custom_money", column.sql_type
assert column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_domain_acts_like_basetype
diff --git a/activerecord/test/cases/adapters/postgresql/enum_test.rb b/activerecord/test/cases/adapters/postgresql/enum_test.rb
index 83cedc5a7b..88b3b2cc0e 100644
--- a/activerecord/test/cases/adapters/postgresql/enum_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/enum_test.rb
@@ -33,7 +33,7 @@ class PostgresqlEnumTest < ActiveRecord::TestCase
assert_equal "mood", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_enum_defaults
diff --git a/activerecord/test/cases/adapters/postgresql/full_text_test.rb b/activerecord/test/cases/adapters/postgresql/full_text_test.rb
index dca35422b9..a370a5adc6 100644
--- a/activerecord/test/cases/adapters/postgresql/full_text_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/full_text_test.rb
@@ -23,7 +23,7 @@ class PostgresqlFullTextTest < ActiveRecord::TestCase
assert_equal "tsvector", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_update_tsvector
diff --git a/activerecord/test/cases/adapters/postgresql/geometric_test.rb b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
index 228221e034..ed2bf554bb 100644
--- a/activerecord/test/cases/adapters/postgresql/geometric_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
@@ -28,7 +28,7 @@ class PostgresqlPointTest < ActiveRecord::TestCase
assert_equal "point", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_default
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index 00ff456e16..a0aa10630c 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -56,7 +56,7 @@ if ActiveRecord::Base.connection.supports_extensions?
assert_equal "hstore", @column.sql_type
assert_not @column.number?
assert_not @column.binary?
- assert_not @column.array
+ assert_not @column.array?
end
def test_default
diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index 340ca29c0e..7be7e00463 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -36,7 +36,7 @@ module PostgresqlJSONSharedTestCases
assert_equal column_type.to_s, column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_default
diff --git a/activerecord/test/cases/adapters/postgresql/ltree_test.rb b/activerecord/test/cases/adapters/postgresql/ltree_test.rb
index 5a0f505072..771a825840 100644
--- a/activerecord/test/cases/adapters/postgresql/ltree_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/ltree_test.rb
@@ -32,7 +32,7 @@ class PostgresqlLtreeTest < ActiveRecord::TestCase
assert_equal "ltree", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_write
diff --git a/activerecord/test/cases/adapters/postgresql/money_test.rb b/activerecord/test/cases/adapters/postgresql/money_test.rb
index 54cff192c1..f3a24eee85 100644
--- a/activerecord/test/cases/adapters/postgresql/money_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/money_test.rb
@@ -27,7 +27,7 @@ class PostgresqlMoneyTest < ActiveRecord::TestCase
assert_equal 2, column.scale
assert column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_default
diff --git a/activerecord/test/cases/adapters/postgresql/network_test.rb b/activerecord/test/cases/adapters/postgresql/network_test.rb
index 4e49ea1e02..daa590f369 100644
--- a/activerecord/test/cases/adapters/postgresql/network_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/network_test.rb
@@ -25,7 +25,7 @@ class PostgresqlNetworkTest < ActiveRecord::TestCase
assert_equal "cidr", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_inet_column
@@ -34,7 +34,7 @@ class PostgresqlNetworkTest < ActiveRecord::TestCase
assert_equal "inet", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_macaddr_column
@@ -43,7 +43,7 @@ class PostgresqlNetworkTest < ActiveRecord::TestCase
assert_equal "macaddr", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_network_types
diff --git a/activerecord/test/cases/adapters/postgresql/uuid_test.rb b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
index d5d2dd16e2..7d2fae69d5 100644
--- a/activerecord/test/cases/adapters/postgresql/uuid_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/uuid_test.rb
@@ -51,7 +51,7 @@ class PostgresqlUUIDTest < ActiveRecord::TestCase
assert_equal "uuid", column.sql_type
assert_not column.number?
assert_not column.binary?
- assert_not column.array
+ assert_not column.array?
end
def test_treat_blank_uuid_as_nil
diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
index d774cfebc4..337360e97f 100644
--- a/activerecord/test/cases/migration/change_schema_test.rb
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -82,7 +82,7 @@ module ActiveRecord
columns = connection.columns(:testings)
array_column = columns.detect { |c| c.name == "foo" }
- assert array_column.array
+ assert array_column.array?
end
def test_create_table_with_array_column
@@ -93,7 +93,7 @@ module ActiveRecord
columns = connection.columns(:testings)
array_column = columns.detect { |c| c.name == "foo" }
- assert array_column.array
+ assert array_column.array?
end
end