Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added connection#current_database that'll return of the current datab…

…ase (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) (closes #3663) [Tom ward]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3911 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 0555fc905c09d4339bfb641428a4ddfcb5f4c0c6 1 parent df97ed5
@dhh dhh authored
View
2  activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added connection#current_database that'll return of the current database (only works in MySQL, SQL Server, and Oracle so far -- please help implement for the rest of the adapters) #3663 [Tom ward]
+
* Fixed that Migration#execute would have the table name prefix appended to its query #4110 [mark.imbriaco@pobox.com]
* Make all tinyint(1) variants act like boolean in mysql (tinyint(1) unsigned, etc.) [Jamis Buck]
View
3  activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -261,6 +261,9 @@ def drop_database(name) #:nodoc:
execute "DROP DATABASE IF EXISTS `#{name}`"
end
+ def current_database
+ select_one("SELECT DATABASE() as db")["db"]
+ end
def tables(name = nil) #:nodoc:
tables = []
View
4 activerecord/lib/active_record/connection_adapters/sqlserver_adapter.rb
@@ -399,6 +399,10 @@ def drop_database(name)
def create_database(name)
execute "CREATE DATABASE #{name}"
end
+
+ def current_database
+ @connection.select_one("select DB_NAME()")[0]
+ end
def tables(name = nil)
execute("SELECT table_name from information_schema.tables WHERE table_type = 'BASE TABLE'", name).inject([]) do |tables, field|
View
13 activerecord/test/adapter_test.rb
@@ -18,8 +18,9 @@ def test_tables
end
def test_indexes
+ idx_name = "accounts_idx"
+
if @connection.respond_to?(:indexes)
- idx_name = "accounts_idx"
indexes = @connection.indexes("accounts")
assert indexes.empty?
@@ -34,7 +35,15 @@ def test_indexes
end
ensure
- @connection.remove_index :accounts, :firm_id rescue nil
+ @connection.remove_index(:accounts, :name => idx_name) rescue nil
+ end
+
+ def test_current_database
+ if @connection.respond_to?(:current_database)
+ assert_equal "activerecord_unittest", @connection.current_database
+ else
+ warn "#{@connection.class} does not respond to #current_database"
+ end
end
# test resetting sequences in odd tables in postgreSQL
Please sign in to comment.
Something went wrong with that request. Please try again.