Changeset 5477
- Timestamp:
- 11/09/06 21:17:43 (2 years ago)
- Files:
-
- trunk/activerecord/CHANGELOG (modified) (1 diff)
- trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb (modified) (2 diffs)
- trunk/activerecord/test/schema_dumper_test.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activerecord/CHANGELOG
r5474 r5477 1 1 *SVN* 2 3 * SQLite: use AUTOINCREMENT primary key in >= 3.1.0. #6588 [careo] 2 4 3 5 * Cache inheritance_column. #6592 [Stefan Kaes] trunk/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
r5426 r5477 109 109 def native_database_types #:nodoc: 110 110 { 111 :primary_key => "INTEGER PRIMARY KEY NOT NULL",111 :primary_key => default_primary_key_type, 112 112 :string => { :name => "varchar", :limit => 255 }, 113 113 :text => { :name => "text" }, … … 352 352 @sqlite_version ||= select_value('select sqlite_version(*)') 353 353 end 354 355 def default_primary_key_type 356 if sqlite_version >= '3.1.0' 357 'INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL'.freeze 358 else 359 'INTEGER PRIMARY KEY NOT NULL'.freeze 360 end 361 end 354 362 end 355 363 trunk/activerecord/test/schema_dumper_test.rb
r4619 r5477 9 9 stream = StringIO.new 10 10 ActiveRecord::SchemaDumper.ignore_tables = [] 11 ActiveRecord::SchemaDumper.ignore_tables << /^sqlite_/ if current_adapter?(:SQLiteAdapter) 11 12 ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream) 12 13 stream.string
