aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-03-15 19:37:44 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-03-22 16:22:00 -0700
commit1c9f7fa6e17d3b026ad6e0bc1f07a9dd47d8a360 (patch)
treee309aff62211b0c7d8d7f3b0d62345def7f7d07b /activerecord
parentcd07f194dc2d8e4278ea9a7d4ccebfe74513b0ac (diff)
downloadrails-1c9f7fa6e17d3b026ad6e0bc1f07a9dd47d8a360.tar.gz
rails-1c9f7fa6e17d3b026ad6e0bc1f07a9dd47d8a360.tar.bz2
rails-1c9f7fa6e17d3b026ad6e0bc1f07a9dd47d8a360.zip
remove to_sql from TableDefinition
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb8
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb2
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_adapter.rb4
3 files changed, 5 insertions, 9 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 952b872f7a..dd1be694e4 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -263,14 +263,6 @@ module ActiveRecord
end
alias :belongs_to :references
- # Returns a String whose contents are the column definitions
- # concatenated together. This string can then be prepended and appended to
- # to generate the final SQL to create the table.
- def to_sql
- viz = @base.schema_creation
- columns.map { |c| viz.accept c }.join ', '
- end
-
private
def create_column_definition(name, type)
ColumnDefinition.new name, type
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 cd4409295f..4b5adb1d59 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -189,7 +189,7 @@ module ActiveRecord
create_sql = "CREATE#{' TEMPORARY' if options[:temporary]} TABLE "
create_sql << "#{quote_table_name(table_name)} ("
- create_sql << td.to_sql
+ create_sql << schema_creation.accept(td)
create_sql << ") #{options[:options]}"
execute create_sql
td.indexes.each_pair { |c,o| add_index table_name, c, o }
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 41ccaf8e58..781ba6a733 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -124,6 +124,10 @@ module ActiveRecord
column_sql
end
+ def visit_TableDefinition(o)
+ o.columns.map { |c| accept c }.join ', '
+ end
+
def quote_column_name(name)
@conn.quote_column_name name
end