aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-06-25 15:49:15 -0700
committerJosé Valim <jose.valim@gmail.com>2010-06-26 00:59:38 +0200
commit4464d10e68045e6723d4eb62734213c4296ef339 (patch)
tree9948b1a88361fb0867a96cfbcef4e226b8984bc2 /activerecord/lib/active_record
parent65aa6a7db16b7387d5a3bf1ad7f5a602804a2f21 (diff)
downloadrails-4464d10e68045e6723d4eb62734213c4296ef339.tar.gz
rails-4464d10e68045e6723d4eb62734213c4296ef339.tar.bz2
rails-4464d10e68045e6723d4eb62734213c4296ef339.zip
index dump should not include full text indexes. Thanks Ken Mayer for the original patch! [#4949 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb11
1 files changed, 3 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index ef58a32074..26d88158d3 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -609,9 +609,7 @@ module ActiveRecord
SQL
- indexes = []
-
- indexes = result.map do |row|
+ result.map do |row|
index_name = row[0]
unique = row[1] == 't'
indkey = row[2].split(" ")
@@ -625,11 +623,8 @@ module ActiveRecord
SQL
column_names = indkey.map {|attnum| columns[attnum] }
- IndexDefinition.new(table_name, index_name, unique, column_names)
-
- end
-
- indexes
+ column_names.compact.empty? ? nil : IndexDefinition.new(table_name, index_name, unique, column_names)
+ end.compact
end
# Returns the list of all column definitions for a table.