aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-02-01 23:34:18 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-02-01 23:34:18 +0000
commit65c337ac856f7cbfa521b8e6a7d1d234b4873038 (patch)
tree46137c4e646cc5a5ccbd343c7c9e5d00767ad6a6 /activerecord
parent49401f880c716aceb0f23051c10bcbd59ed89574 (diff)
downloadrails-65c337ac856f7cbfa521b8e6a7d1d234b4873038.tar.gz
rails-65c337ac856f7cbfa521b8e6a7d1d234b4873038.tar.bz2
rails-65c337ac856f7cbfa521b8e6a7d1d234b4873038.zip
Fixed schema handling for DB2 adapter that didn't work: an initial schema could be set, but it wasn't used when getting tables and indexes (closes #3678) [Maik Schmidt]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3518 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--activerecord/lib/active_record/connection_adapters/db2_adapter.rb9
-rw-r--r--activerecord/lib/active_record/vendor/db2.rb10
3 files changed, 13 insertions, 8 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index c8c4cf8845..8c2c7ad9cc 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed schema handling for DB2 adapter that didn't work: an initial schema could be set, but it wasn't used when getting tables and indexes #3678 [Maik Schmidt]
+
* Support the :column option for remove_index with the PostgreSQL adapter. #3661 [shugo@ruby-lang.org]
* Add documentation for add_index and remove_index. #3600 [Manfred Stienstra <m.stienstra@fngtps.com>]
diff --git a/activerecord/lib/active_record/connection_adapters/db2_adapter.rb b/activerecord/lib/active_record/connection_adapters/db2_adapter.rb
index 515444a21e..888b1a8086 100644
--- a/activerecord/lib/active_record/connection_adapters/db2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/db2_adapter.rb
@@ -112,16 +112,18 @@ begin
def tables(name = nil)
result = []
+ schema = @connection_options[:schema] || '%'
with_statement do |stmt|
- stmt.tables.each { |t| result << t[2].downcase }
+ stmt.tables(schema).each { |t| result << t[2].downcase }
end
result
end
def indexes(table_name, name = nil)
tmp = {}
+ schema = @connection_options[:schema] || ''
with_statement do |stmt|
- stmt.indexes(table_name.upcase).each do |t|
+ stmt.indexes(table_name, schema).each do |t|
next unless t[5]
next if t[4] == 'SYSIBM' # Skip system indexes.
idx_name = t[5].downcase
@@ -139,8 +141,9 @@ begin
def columns(table_name, name = nil)
result = []
+ schema = @connection_options[:schema] || '%'
with_statement do |stmt|
- stmt.columns(table_name.upcase).each do |c|
+ stmt.columns(table_name, schema).each do |c|
c_name = c[3].downcase
c_default = c[12] == 'NULL' ? nil : c[12]
c_type = c[5].downcase
diff --git a/activerecord/lib/active_record/vendor/db2.rb b/activerecord/lib/active_record/vendor/db2.rb
index 5ebd348a0a..ec652f8706 100644
--- a/activerecord/lib/active_record/vendor/db2.rb
+++ b/activerecord/lib/active_record/vendor/db2.rb
@@ -111,17 +111,17 @@ module DB2
end
def columns(table_name, schema_name = '%')
- check_rc(SQLColumns(@handle, '', schema_name, table_name, '%'))
+ check_rc(SQLColumns(@handle, '', schema_name.upcase, table_name.upcase, '%'))
fetch_all
end
- def tables
- check_rc(SQLTables(@handle, '', '%', '%', 'TABLE'))
+ def tables(schema_name = '%')
+ check_rc(SQLTables(@handle, '', schema_name.upcase, '%', 'TABLE'))
fetch_all
end
- def indexes(table_name)
- check_rc(SQLStatistics(@handle, '', '', table_name, SQL_INDEX_ALL, SQL_ENSURE))
+ def indexes(table_name, schema_name = '')
+ check_rc(SQLStatistics(@handle, '', schema_name.upcase, table_name.upcase, SQL_INDEX_ALL, SQL_ENSURE))
fetch_all
end