Make tests pass again for PostgreSQL and MySQL adapters.

activewarehouse · Aug 25, 2010 · c8bcd63 · c8bcd63
1 parent c21f444
commit c8bcd63
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/lib/rails_sql_views/connection_adapters/abstract/schema_statements.rb b/lib/rails_sql_views/connection_adapters/abstract/schema_statements.rb
@@ -59,7 +59,7 @@ def create_mapping_view(old_name, new_name, options = {})
       end
 
       def drop_table_with_cascade(table_name, options = {})
-        execute "DROP TABLE #{quote_table_name(table_name)} CASCADE CONSTRAINTS"
+        execute "DROP TABLE #{quote_table_name(table_name)} CASCADE"
       end
 
       # Drop a view.

diff --git a/lib/rails_sql_views/connection_adapters/postgresql_adapter.rb b/lib/rails_sql_views/connection_adapters/postgresql_adapter.rb
@@ -2,7 +2,7 @@ module RailsSqlViews
   module ConnectionAdapters
     module PostgreSQLAdapter
       def self.included(base)
-        base.alias_method_chain :tables, :views_included unless base.method_defined?(:tables_with_views_included)
+        base.alias_method_chain :tables, :views_included
       end
       # Returns true as this adapter supports views.
       def supports_views?

diff --git a/test/connection/native_mysql/connection.rb b/test/connection/native_mysql/connection.rb
@@ -6,8 +6,9 @@
 #require 'logger'
 #ActiveRecord::Base.logger = Logger.new("debug.log")
 
-ActiveRecord::Base.configurations = {
-  config['database'] => {
+ActiveRecord::Base.silence do
+  ActiveRecord::Base.configurations = {
+    config['database'] => {
     :adapter  => adapter_name,
     :username => config['username'],
     :password => config['password'],
@@ -16,15 +17,16 @@
     :encoding => config['encoding'],
     :schema_file => config['schema_file'],
   }
-}
+  }
 
-ActiveRecord::Base.establish_connection config['database']
-ActiveRecord::Migration.verbose = false
+  ActiveRecord::Base.establish_connection config['database']
+  ActiveRecord::Migration.verbose = false
 
-puts "Resetting database"
-conn = ActiveRecord::Base.connection
-conn.recreate_database(conn.current_database)
-conn.reconnect!
-lines = open(File.join(File.dirname(__FILE__), ActiveRecord::Base.configurations[config['database']][:schema_file])).readlines
-lines.join.split(';').each { |line| conn.execute(line) }
-conn.reconnect!
+  puts "Resetting database"
+  conn = ActiveRecord::Base.connection
+  conn.recreate_database(conn.current_database)
+  conn.reconnect!
+  lines = open(File.join(File.dirname(__FILE__), ActiveRecord::Base.configurations[config['database']][:schema_file])).readlines
+  lines.join.split(';').each { |line| conn.execute(line) }
+  conn.reconnect!
+end
diff --git a/test/connection/native_postgresql/connection.rb b/test/connection/native_postgresql/connection.rb
@@ -6,7 +6,8 @@
 #require 'logger'
 #ActiveRecord::Base.logger = Logger.new("debug.log")
 
-ActiveRecord::Base.configurations = {
+ActiveRecord::Base.silence do
+  ActiveRecord::Base.configurations = {
   'rails_sql_views_unittest' => {
     :adapter  => adapter_name,
     :username => config['username'],
@@ -16,14 +17,15 @@
     :encoding => config['encoding'],
     :schema_file => config['schema_file'],
   }
-}
+  }
 
-ActiveRecord::Base.establish_connection config['database']
+  ActiveRecord::Base.establish_connection config['database']
 
-puts "Resetting database"
-conn = ActiveRecord::Base.connection
-#conn.recreate_database(conn.current_database)
-conn.reconnect!
-lines = open(File.join(File.dirname(__FILE__), ActiveRecord::Base.configurations[config['database']][:schema_file])).readlines
-lines.join.split(';').each { |line| conn.execute(line) }
-conn.reconnect!
+  puts "Resetting database"
+  conn = ActiveRecord::Base.connection
+  #conn.recreate_database(conn.current_database)
+  conn.reconnect!
+  lines = open(File.join(File.dirname(__FILE__), ActiveRecord::Base.configurations[config['database']][:schema_file])).readlines
+  lines.join.split(';').each { |line| conn.execute(line) }
+  conn.reconnect!
+end