Small fix so ActiveRecord::Base.connection.tables works with odbc/sql…

…server Without the patch, ActiveRecord::Base.connection.tables returns []
gaizka · Feb 25, 2009 · 6d7faaf · 6d7faaf
1 parent f231ed3
commit 6d7faaf
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/lib/active_record/connection_adapters/odbc_adapter.rb b/lib/active_record/connection_adapters/odbc_adapter.rb
@@ -974,7 +974,15 @@ def tables(name = nil)
             tblType = row[3]
             next if respond_to?("table_filter") && table_filter(schemaName, tblName, tblType)
             if @@dbmsLookups.get_info(@dbmsName, @dbmsMajorVer, :supports_schema_names)
-              tblNames << activeRecIdentCase(tblName) if schemaName.casecmp(currentUser) == 0
+              if currentUser.nil? || currentUser.blank?
+                # Cannot check schemaName against currentUser.
+                # Let's check by tblType
+                if tblType == "TABLE"
+                  tblNames << activeRecIdentCase(tblName) 
+                end
+              elsif schemaName.casecmp(currentUser) == 0
+                tblNames << activeRecIdentCase(tblName)
+              end
             else
               tblNames << activeRecIdentCase(tblName)
             end