diff options
10 files changed, 11 insertions, 2 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index af3362fe83..8b5fc450f8 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Correct syntax error in mysql DDL, and make AAACreateTablesTest run first [Bob Silva] + * Allow :include to be used with has_many :through associations #3611 [Michael Schoen] * PostgreSQL: smarter schema dumps using pk_and_sequence_for(table). #2920 [Blair Zajac] diff --git a/activerecord/test/aaa_create_tables_test.rb b/activerecord/test/aaa_create_tables_test.rb index 10ac9c525d..fe83045c8f 100644 --- a/activerecord/test/aaa_create_tables_test.rb +++ b/activerecord/test/aaa_create_tables_test.rb @@ -1,7 +1,7 @@ # The filename begins with "aaa" to ensure this is the first test. require 'abstract_unit' -class CreateTablesTest < Test::Unit::TestCase +class AAACreateTablesTest < Test::Unit::TestCase self.use_transactional_fixtures = false def setup diff --git a/activerecord/test/fixtures/db_definitions/db2.drop.sql b/activerecord/test/fixtures/db_definitions/db2.drop.sql index b6febbc40d..f669b88109 100644 --- a/activerecord/test/fixtures/db_definitions/db2.drop.sql +++ b/activerecord/test/fixtures/db_definitions/db2.drop.sql @@ -14,6 +14,7 @@ DROP TABLE entrants; DROP TABLE colnametests; DROP TABLE mixins; DROP TABLE people; +DROP TABLE readers; DROP TABLE binaries; DROP TABLE computers; DROP TABLE posts; diff --git a/activerecord/test/fixtures/db_definitions/firebird.drop.sql b/activerecord/test/fixtures/db_definitions/firebird.drop.sql index b9df0fe1ab..97a4e66d91 100644 --- a/activerecord/test/fixtures/db_definitions/firebird.drop.sql +++ b/activerecord/test/fixtures/db_definitions/firebird.drop.sql @@ -14,6 +14,7 @@ DROP TABLE entrants; DROP TABLE colnametests; DROP TABLE mixins; DROP TABLE people; +DROP TABLE readers; DROP TABLE binaries; DROP TABLE computers; DROP TABLE posts; diff --git a/activerecord/test/fixtures/db_definitions/mysql.drop.sql b/activerecord/test/fixtures/db_definitions/mysql.drop.sql index 699ce40db1..c6a8c51fa3 100644 --- a/activerecord/test/fixtures/db_definitions/mysql.drop.sql +++ b/activerecord/test/fixtures/db_definitions/mysql.drop.sql @@ -14,6 +14,7 @@ DROP TABLE entrants; DROP TABLE colnametests; DROP TABLE mixins; DROP TABLE people; +DROP TABLE readers; DROP TABLE binaries; DROP TABLE computers; DROP TABLE tasks; diff --git a/activerecord/test/fixtures/db_definitions/mysql.sql b/activerecord/test/fixtures/db_definitions/mysql.sql index 21c3b0176e..6e5232e82d 100755 --- a/activerecord/test/fixtures/db_definitions/mysql.sql +++ b/activerecord/test/fixtures/db_definitions/mysql.sql @@ -204,7 +204,7 @@ CREATE TABLE `keyboards` ( `name` varchar(50) default NULL ); ---Altered lock_version column name. +-- Altered lock_version column name. CREATE TABLE `legacy_things` ( `id` int(11) NOT NULL auto_increment, `tps_report_number` int(11) default NULL, diff --git a/activerecord/test/fixtures/db_definitions/oci.drop.sql b/activerecord/test/fixtures/db_definitions/oci.drop.sql index 6e73717d69..0a8684fb88 100644 --- a/activerecord/test/fixtures/db_definitions/oci.drop.sql +++ b/activerecord/test/fixtures/db_definitions/oci.drop.sql @@ -16,6 +16,7 @@ drop table entrants; drop table colnametests; drop table mixins; drop table people; +drop table readers; drop table binaries; drop table comments; drop table authors; diff --git a/activerecord/test/fixtures/db_definitions/postgresql.drop.sql b/activerecord/test/fixtures/db_definitions/postgresql.drop.sql index 306890dd3e..5382e1ddc0 100644 --- a/activerecord/test/fixtures/db_definitions/postgresql.drop.sql +++ b/activerecord/test/fixtures/db_definitions/postgresql.drop.sql @@ -15,6 +15,7 @@ DROP TABLE entrants; DROP TABLE colnametests; DROP TABLE mixins; DROP TABLE people; +DROP TABLE readers; DROP TABLE binaries; DROP TABLE computers; DROP TABLE posts; diff --git a/activerecord/test/fixtures/db_definitions/sqlite.drop.sql b/activerecord/test/fixtures/db_definitions/sqlite.drop.sql index 699ce40db1..c6a8c51fa3 100644 --- a/activerecord/test/fixtures/db_definitions/sqlite.drop.sql +++ b/activerecord/test/fixtures/db_definitions/sqlite.drop.sql @@ -14,6 +14,7 @@ DROP TABLE entrants; DROP TABLE colnametests; DROP TABLE mixins; DROP TABLE people; +DROP TABLE readers; DROP TABLE binaries; DROP TABLE computers; DROP TABLE tasks; diff --git a/activerecord/test/fixtures/db_definitions/sqlserver.drop.sql b/activerecord/test/fixtures/db_definitions/sqlserver.drop.sql index c8803e8360..18e4dc2bd3 100644 --- a/activerecord/test/fixtures/db_definitions/sqlserver.drop.sql +++ b/activerecord/test/fixtures/db_definitions/sqlserver.drop.sql @@ -14,6 +14,7 @@ DROP TABLE entrants; DROP TABLE colnametests; DROP TABLE mixins; DROP TABLE people; +DROP TABLE readers; DROP TABLE binaries; DROP TABLE computers; DROP TABLE posts; |