diff options
author | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-18 15:16:54 -0700 |
---|---|---|
committer | Jeremy Daer <jeremydaer@gmail.com> | 2016-04-18 15:31:15 -0700 |
commit | fe685c62929fd3c67df041f1ccb0def2ff051f35 (patch) | |
tree | 3c913b577e00405c3f1b5247907fc6153f655f7a /activerecord/lib/active_record/connection_adapters/sqlite3 | |
parent | 983b743c8c8695c0235d6a3a9fe91a7a759cf0cb (diff) | |
parent | 98fb37449e57ab1d956de0ff1d1e309f8b28814b (diff) | |
download | rails-fe685c62929fd3c67df041f1ccb0def2ff051f35.tar.gz rails-fe685c62929fd3c67df041f1ccb0def2ff051f35.tar.bz2 rails-fe685c62929fd3c67df041f1ccb0def2ff051f35.zip |
Merge pull request #23622 from kamipo/primary_key_should_be_not_null
Primary key should be `NOT NULL`
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite3')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3/schema_creation.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3/schema_creation.rb b/activerecord/lib/active_record/connection_adapters/sqlite3/schema_creation.rb index fe1dcbd710..70c0d28830 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3/schema_creation.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3/schema_creation.rb @@ -3,6 +3,13 @@ module ActiveRecord module SQLite3 class SchemaCreation < AbstractAdapter::SchemaCreation private + + def column_options(o) + options = super + options[:null] = false if o.primary_key + options + end + def add_column_options!(sql, options) if options[:collation] sql << " COLLATE \"#{options[:collation]}\"" |