mirror of
https://github.com/github/rails.git
synced 2026-04-26 03:00:59 -04:00
fixing whitespace errors
This commit is contained in:
@@ -2,7 +2,7 @@ require 'active_support/core_ext/object/blank'
|
||||
|
||||
module ActiveRecord
|
||||
# = Active Record Schema
|
||||
#
|
||||
#
|
||||
# Allows programmers to programmatically define a schema in a portable
|
||||
# DSL. This means you can define tables, indexes, etc. without using SQL
|
||||
# directly, so your applications can more easily support multiple
|
||||
|
||||
@@ -8,13 +8,13 @@ module ActiveRecord
|
||||
# output format (i.e., ActiveRecord::Schema).
|
||||
class SchemaDumper #:nodoc:
|
||||
private_class_method :new
|
||||
|
||||
|
||||
##
|
||||
# :singleton-method:
|
||||
# A list of tables which should not be dumped to the schema.
|
||||
# A list of tables which should not be dumped to the schema.
|
||||
# Acceptable values are strings as well as regexp.
|
||||
# This setting is only used if ActiveRecord::Base.schema_format == :ruby
|
||||
cattr_accessor :ignore_tables
|
||||
cattr_accessor :ignore_tables
|
||||
@@ignore_tables = []
|
||||
|
||||
def self.dump(connection=ActiveRecord::Base.connection, stream=STDOUT)
|
||||
@@ -71,7 +71,7 @@ HEADER
|
||||
else
|
||||
raise StandardError, 'ActiveRecord::SchemaDumper.ignore_tables accepts an array of String and / or Regexp values.'
|
||||
end
|
||||
end
|
||||
end
|
||||
table(tbl, stream)
|
||||
end
|
||||
end
|
||||
@@ -87,7 +87,7 @@ HEADER
|
||||
elsif @connection.respond_to?(:primary_key)
|
||||
pk = @connection.primary_key(table)
|
||||
end
|
||||
|
||||
|
||||
tbl.print " create_table #{table.inspect}"
|
||||
if columns.detect { |c| c.name == pk }
|
||||
if pk != 'id'
|
||||
@@ -105,7 +105,7 @@ HEADER
|
||||
next if column.name == pk
|
||||
spec = {}
|
||||
spec[:name] = column.name.inspect
|
||||
|
||||
|
||||
# AR has an optimisation which handles zero-scale decimals as integers. This
|
||||
# code ensures that the dumper still dumps the column as a decimal.
|
||||
spec[:type] = if column.type == :integer && [/^numeric/, /^decimal/].any? { |e| e.match(column.sql_type) }
|
||||
@@ -148,7 +148,7 @@ HEADER
|
||||
|
||||
tbl.puts " end"
|
||||
tbl.puts
|
||||
|
||||
|
||||
indexes(table, tbl)
|
||||
|
||||
tbl.rewind
|
||||
@@ -158,7 +158,7 @@ HEADER
|
||||
stream.puts "# #{e.message}"
|
||||
stream.puts
|
||||
end
|
||||
|
||||
|
||||
stream
|
||||
end
|
||||
|
||||
@@ -172,7 +172,7 @@ HEADER
|
||||
value.inspect
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def indexes(table, stream)
|
||||
if (indexes = @connection.indexes(table)).any?
|
||||
add_index_statements = indexes.map do |index|
|
||||
|
||||
Reference in New Issue
Block a user