1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Revert naive O(1) table_exists? implementation.

It was a bad idea to rescue exceptions here. This can interfere with
transaction rollbacks which seems to be the cause of current CI
failure.

Instead, each adapter should implement its own DB-specific O(1)
implementation, and we fall back on the generic, slower, implementation
otherwise.
This commit is contained in:
Jon Leighton 2011-12-13 23:43:42 +00:00
parent c7552d988e
commit 38703ac897
4 changed files with 16 additions and 12 deletions

View file

@ -16,17 +16,12 @@ module ActiveRecord
table_name[0...table_alias_length].gsub(/\./, '_')
end
# def tables(name = nil) end
# Checks to see if the table +table_name+ exists on the database.
#
# === Example
# table_exists?(:developers)
def table_exists?(table_name)
select_value("SELECT 1 FROM #{quote_table_name(table_name)} where 1=0", 'SCHEMA')
true
rescue
false
tables.include?(table_name.to_s)
end
# Returns an array of indexes for the given table.

View file

@ -363,8 +363,10 @@ module ActiveRecord
show_variable 'collation_database'
end
def tables(name = nil, database = nil) #:nodoc:
sql = ["SHOW TABLES", database].compact.join(' IN ')
def tables(name = nil, database = nil, like = nil) #:nodoc:
sql = "SHOW TABLES "
sql << "IN #{database} " if database
sql << "LIKE #{quote(like)}" if like
execute_and_free(sql, 'SCHEMA') do |result|
result.collect { |field| field.first }
@ -372,7 +374,8 @@ module ActiveRecord
end
def table_exists?(name)
return true if super
return false unless name
return true if tables(nil, nil, name).any?
name = name.to_s
schema, table = name.split('.', 2)
@ -382,7 +385,7 @@ module ActiveRecord
schema = nil
end
tables(nil, schema).include? table
tables(nil, schema, table).any?
end
# Returns an array of indexes for the given table.

View file

@ -329,18 +329,23 @@ module ActiveRecord
# SCHEMA STATEMENTS ========================================
def tables(name = 'SCHEMA') #:nodoc:
def tables(name = 'SCHEMA', table_name = nil) #:nodoc:
sql = <<-SQL
SELECT name
FROM sqlite_master
WHERE type = 'table' AND NOT name = 'sqlite_sequence'
SQL
sql << " AND name = #{quote_table_name(table_name)}" if table_name
exec_query(sql, name).map do |row|
row['name']
end
end
def table_exists?(name)
name && tables('SCHEMA', name).any?
end
# Returns an array of +SQLiteColumn+ objects for the table specified by +table_name+.
def columns(table_name, name = nil) #:nodoc:
table_structure(table_name).map do |field|

View file

@ -17,6 +17,7 @@ module ActiveRecord
def test_table_exists?
assert @connection.table_exists?("accounts")
assert !@connection.table_exists?("nonexistingtable")
assert !@connection.table_exists?(nil)
end
def test_indexes