diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-29 18:40:49 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-10-29 18:40:49 +0000 |
commit | 68160b34854f6b886b3cf9fe3045af1d18128747 (patch) | |
tree | 873cc3c0e6d96c7f94f023385c823df237a9e79e /activerecord/lib/active_record/connection_adapters/abstract | |
parent | 14b60fc074d8a97379561003281df70053225e01 (diff) | |
download | rails-68160b34854f6b886b3cf9fe3045af1d18128747.tar.gz rails-68160b34854f6b886b3cf9fe3045af1d18128747.tar.bz2 rails-68160b34854f6b886b3cf9fe3045af1d18128747.zip |
Added migration support for Oracle (closes #2647) [Michael Schoen]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 4 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index d318e07750..b5fe57a0c0 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -232,14 +232,14 @@ module ActiveRecord @columns << column unless @columns.include? column self end - + # Returns a String whose contents are the column definitions # concatenated together. This string can then be pre and appended to # to generate the final SQL to create the table. def to_sql @columns * ', ' end - + private def native @base.native_database_types diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index 847cd4eeee..d1e6dcf025 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -239,8 +239,8 @@ module ActiveRecord end def add_column_options!(sql, options) #:nodoc: - sql << " NOT NULL" if options[:null] == false sql << " DEFAULT #{quote(options[:default], options[:column])}" unless options[:default].nil? + sql << " NOT NULL" if options[:null] == false end end end |