diff options
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/fixtures/db_definitions/schema.rb | 7 | ||||
| -rw-r--r-- | activerecord/test/schema_dumper_test.rb | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/db_definitions/schema.rb b/activerecord/test/fixtures/db_definitions/schema.rb index 9c851817ec..b5d7704d2e 100644 --- a/activerecord/test/fixtures/db_definitions/schema.rb +++ b/activerecord/test/fixtures/db_definitions/schema.rb @@ -57,4 +57,11 @@ ActiveRecord::Schema.define do create_table :lock_without_defaults_cust, :force => true do |t| t.column :custom_lock_version, :integer end + + # For sqlite 3.1.0+, make a table with a autoincrement column + if adapter_name == 'SQLite' and supports_autoincrement? + create_table :table_with_autoincrement, :force => true do |t| + t.column :name, :string + end + end end diff --git a/activerecord/test/schema_dumper_test.rb b/activerecord/test/schema_dumper_test.rb index 016f66077d..8cbcbb39e5 100644 --- a/activerecord/test/schema_dumper_test.rb +++ b/activerecord/test/schema_dumper_test.rb @@ -8,7 +8,6 @@ if ActiveRecord::Base.connection.respond_to?(:tables) def standard_dump stream = StringIO.new ActiveRecord::SchemaDumper.ignore_tables = [] - ActiveRecord::SchemaDumper.ignore_tables << /^sqlite_/ if current_adapter?(:SQLiteAdapter) ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream) stream.string end @@ -20,6 +19,11 @@ if ActiveRecord::Base.connection.respond_to?(:tables) assert_no_match %r{create_table "schema_info"}, output end + def test_schema_dump_excludes_sqlite_sequence + output = standard_dump + assert_no_match %r{create_table "sqlite_sequence"}, output + end + def assert_line_up(lines, pattern, required = false) return assert(true) if lines.empty? matches = lines.map { |line| line.match(pattern) } |