Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed that create database statements would always include "DEFAULT N…
…ULL" (Nick Sieger) [#334 status:committed]
  • Loading branch information
dhh committed Jul 14, 2008
1 parent 0176e6a commit 3037022
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 1 deletion.
2 changes: 2 additions & 0 deletions activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*Edge*

* Fixed that create database statements would always include "DEFAULT NULL" (Nick Sieger) [#334]

* Add :accessible option to associations for allowing (opt-in) mass assignment. #474. [David Dollar] Example :

class Post < ActiveRecord::Base
Expand Down
Expand Up @@ -257,7 +257,10 @@ def sql_type

def to_sql
column_sql = "#{base.quote_column_name(name)} #{sql_type}"
add_column_options!(column_sql, :null => null, :default => default) unless type.to_sym == :primary_key
column_options = {}
column_options[:null] = null unless null.nil?
column_options[:default] = default unless default.nil?
add_column_options!(column_sql, column_options) unless type.to_sym == :primary_key
column_sql
end
alias to_s :to_sql
Expand Down
36 changes: 36 additions & 0 deletions activerecord/test/cases/column_definition_test.rb
@@ -0,0 +1,36 @@
require "cases/helper"

class ColumnDefinitionTest < ActiveRecord::TestCase
def setup
@adapter = ActiveRecord::ConnectionAdapters::AbstractAdapter.new(nil)
def @adapter.native_database_types
{:string => "varchar"}
end
end

# Avoid column definitions in create table statements like:
# `title` varchar(255) DEFAULT NULL NULL
def test_should_not_include_default_clause_when_default_is_null
column = ActiveRecord::ConnectionAdapters::Column.new("title", nil, "varchar(20)")
column_def = ActiveRecord::ConnectionAdapters::ColumnDefinition.new(
@adapter, column.name, "string",
column.limit, column.precision, column.scale, column.default, column.null)
assert_equal "title varchar(20) NULL", column_def.to_sql
end

def test_should_include_default_clause_when_default_is_present
column = ActiveRecord::ConnectionAdapters::Column.new("title", "Hello", "varchar(20)")
column_def = ActiveRecord::ConnectionAdapters::ColumnDefinition.new(
@adapter, column.name, "string",
column.limit, column.precision, column.scale, column.default, column.null)
assert_equal %Q{title varchar(20) DEFAULT 'Hello' NULL}, column_def.to_sql
end

def test_should_specify_not_null_if_null_option_is_false
column = ActiveRecord::ConnectionAdapters::Column.new("title", "Hello", "varchar(20)", false)
column_def = ActiveRecord::ConnectionAdapters::ColumnDefinition.new(
@adapter, column.name, "string",
column.limit, column.precision, column.scale, column.default, column.null)
assert_equal %Q{title varchar(20) DEFAULT 'Hello' NOT NULL}, column_def.to_sql
end
end

0 comments on commit 3037022

Please sign in to comment.