diff options
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/adapters/firebird/connection_test.rb (renamed from activerecord/test/cases/connection_test_firebird.rb) | 0 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/firebird/default_test.rb (renamed from activerecord/test/cases/default_test_firebird.rb) | 0 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/firebird/migration_test.rb (renamed from activerecord/test/cases/migration_test_firebird.rb) | 0 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/mysql/active_schema_test.rb (renamed from activerecord/test/cases/active_schema_test_mysql.rb) | 0 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/mysql/connection_test.rb (renamed from activerecord/test/cases/connection_test_mysql.rb) | 0 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/mysql/reserved_word_test.rb (renamed from activerecord/test/cases/reserved_word_test_mysql.rb) | 0 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/oracle/synonym_test.rb (renamed from activerecord/test/cases/synonym_test_oracle.rb) | 0 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/active_schema_test.rb (renamed from activerecord/test/cases/active_schema_test_postgresql.rb) | 0 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/datatype_test.rb (renamed from activerecord/test/cases/datatype_test_postgresql.rb) | 2 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb (renamed from activerecord/test/cases/schema_authorization_test_postgresql.rb) | 2 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/postgresql/schema_test.rb (renamed from activerecord/test/cases/schema_test_postgresql.rb) | 4 | ||||
-rw-r--r-- | activerecord/test/cases/adapters/sqlite/copy_table_test.rb (renamed from activerecord/test/cases/copy_table_test_sqlite.rb) | 0 | ||||
-rw-r--r-- | activerecord/test/cases/relations_test.rb | 12 | ||||
-rw-r--r-- | activerecord/test/fixtures/topics.yml | 2 |
14 files changed, 19 insertions, 3 deletions
diff --git a/activerecord/test/cases/connection_test_firebird.rb b/activerecord/test/cases/adapters/firebird/connection_test.rb index f57ea686a5..f57ea686a5 100644 --- a/activerecord/test/cases/connection_test_firebird.rb +++ b/activerecord/test/cases/adapters/firebird/connection_test.rb diff --git a/activerecord/test/cases/default_test_firebird.rb b/activerecord/test/cases/adapters/firebird/default_test.rb index 713c7e11bf..713c7e11bf 100644 --- a/activerecord/test/cases/default_test_firebird.rb +++ b/activerecord/test/cases/adapters/firebird/default_test.rb diff --git a/activerecord/test/cases/migration_test_firebird.rb b/activerecord/test/cases/adapters/firebird/migration_test.rb index 710661b9bd..710661b9bd 100644 --- a/activerecord/test/cases/migration_test_firebird.rb +++ b/activerecord/test/cases/adapters/firebird/migration_test.rb diff --git a/activerecord/test/cases/active_schema_test_mysql.rb b/activerecord/test/cases/adapters/mysql/active_schema_test.rb index 6e6645511c..6e6645511c 100644 --- a/activerecord/test/cases/active_schema_test_mysql.rb +++ b/activerecord/test/cases/adapters/mysql/active_schema_test.rb diff --git a/activerecord/test/cases/connection_test_mysql.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb index 8e4842a1b6..8e4842a1b6 100644 --- a/activerecord/test/cases/connection_test_mysql.rb +++ b/activerecord/test/cases/adapters/mysql/connection_test.rb diff --git a/activerecord/test/cases/reserved_word_test_mysql.rb b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb index 90d8b0d923..90d8b0d923 100644 --- a/activerecord/test/cases/reserved_word_test_mysql.rb +++ b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb diff --git a/activerecord/test/cases/synonym_test_oracle.rb b/activerecord/test/cases/adapters/oracle/synonym_test.rb index b9a422a6ca..b9a422a6ca 100644 --- a/activerecord/test/cases/synonym_test_oracle.rb +++ b/activerecord/test/cases/adapters/oracle/synonym_test.rb diff --git a/activerecord/test/cases/active_schema_test_postgresql.rb b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb index f106e14319..f106e14319 100644 --- a/activerecord/test/cases/active_schema_test_postgresql.rb +++ b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb diff --git a/activerecord/test/cases/datatype_test_postgresql.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb index 3c2d9fb7bd..5bb8fa2f93 100644 --- a/activerecord/test/cases/datatype_test_postgresql.rb +++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb @@ -53,7 +53,7 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase @connection.execute("INSERT INTO postgresql_oids (obj_id) VALUES (1234)") @first_oid = PostgresqlOid.find(1) - + @connection.execute("INSERT INTO postgresql_timestamp_with_zones (time) VALUES ('2010-01-01 10:00:00-1')") end diff --git a/activerecord/test/cases/schema_authorization_test_postgresql.rb b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb index 2860f1ad48..6f372edc38 100644 --- a/activerecord/test/cases/schema_authorization_test_postgresql.rb +++ b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb @@ -66,7 +66,7 @@ class SchemaAuthorizationTest < ActiveRecord::TestCase end end end - + def test_tables_in_current_schemas assert !@connection.tables.include?(TABLE_NAME) USERS.each do |u| diff --git a/activerecord/test/cases/schema_test_postgresql.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb index 3ed9b1974d..a5c3e69af9 100644 --- a/activerecord/test/cases/schema_test_postgresql.rb +++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb @@ -9,9 +9,11 @@ class SchemaTest < ActiveRecord::TestCase CAPITALIZED_TABLE_NAME = 'Things' INDEX_A_NAME = 'a_index_things_on_name' INDEX_B_NAME = 'b_index_things_on_different_columns_in_each_schema' + INDEX_C_NAME = 'c_index_full_text_search' INDEX_A_COLUMN = 'name' INDEX_B_COLUMN_S1 = 'email' INDEX_B_COLUMN_S2 = 'moment' + INDEX_C_COLUMN = %q{(to_tsvector('english', coalesce(things.name, '')))} COLUMNS = [ 'id integer', 'name character varying(50)', @@ -45,6 +47,8 @@ class SchemaTest < ActiveRecord::TestCase @connection.execute "CREATE INDEX #{INDEX_A_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME} USING btree (#{INDEX_A_COLUMN});" @connection.execute "CREATE INDEX #{INDEX_B_NAME} ON #{SCHEMA_NAME}.#{TABLE_NAME} USING btree (#{INDEX_B_COLUMN_S1});" @connection.execute "CREATE INDEX #{INDEX_B_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME} USING btree (#{INDEX_B_COLUMN_S2});" + @connection.execute "CREATE INDEX #{INDEX_C_NAME} ON #{SCHEMA_NAME}.#{TABLE_NAME} USING gin (#{INDEX_C_COLUMN});" + @connection.execute "CREATE INDEX #{INDEX_C_NAME} ON #{SCHEMA2_NAME}.#{TABLE_NAME} USING gin (#{INDEX_C_COLUMN});" end def teardown diff --git a/activerecord/test/cases/copy_table_test_sqlite.rb b/activerecord/test/cases/adapters/sqlite/copy_table_test.rb index 575b4806c1..575b4806c1 100644 --- a/activerecord/test/cases/copy_table_test_sqlite.rb +++ b/activerecord/test/cases/adapters/sqlite/copy_table_test.rb diff --git a/activerecord/test/cases/relations_test.rb b/activerecord/test/cases/relations_test.rb index 5b1c6b8f22..d37f7bd09c 100644 --- a/activerecord/test/cases/relations_test.rb +++ b/activerecord/test/cases/relations_test.rb @@ -110,6 +110,18 @@ class RelationTest < ActiveRecord::TestCase assert_equal topics(:first).title, topics.first.title end + def test_finding_with_order_concatenated + topics = Topic.order('author_name').order('title') + assert_equal 4, topics.to_a.size + assert_equal topics(:fourth).title, topics.first.title + end + + def test_finding_with_reorder + topics = Topic.order('author_name').order('title').reorder('id') + assert_equal 4, topics.to_a.size + assert_equal topics(:first).title, topics.first.title + end + def test_finding_with_order_and_take entrants = Entrant.order("id ASC").limit(2).to_a diff --git a/activerecord/test/fixtures/topics.yml b/activerecord/test/fixtures/topics.yml index 1769152445..93f48aedc4 100644 --- a/activerecord/test/fixtures/topics.yml +++ b/activerecord/test/fixtures/topics.yml @@ -24,7 +24,7 @@ second: third: id: 3 title: The Third Topic of the day - author_name: Nick + author_name: Carl written_on: 2005-07-15t15:28:00.0099+01:00 content: I'm a troll approved: true |