Properly handle MySQL results from JDBC

Author: liveh2o

lib/spectacles/schema_statements/mysql2_adapter.rb

@@ -5,13 +5,12 @@ module Mysql2Adapter
 
       def views(name = nil) # :nodoc:
         result = execute("SHOW FULL TABLES WHERE TABLE_TYPE='VIEW'")
-
-        rows_from(result).map(&:first)
+        values_from(result).map(&:first)
       end
 
       def view_build_query(view, name = nil)
         result = execute("SHOW CREATE VIEW #{view}", name)
-        algorithm_string = rows_from(result).first[1]
+        algorithm_string = values_from(result).first[1]
 
         algorithm_string.gsub(/CREATE .*? (AS)+/i, "")
       rescue ActiveRecord::StatementInvalid => e
@@ -20,8 +19,8 @@ def view_build_query(view, name = nil)
 
       private
 
-      def rows_from(result)
-        result.respond_to?(:rows) ? result.rows : result
+      def values_from(result)
+        result.first.respond_to?(:values) ? result.map(&:values) : result
       end
     end
   end

test/support/schema_statement_examples.rb

@@ -17,12 +17,18 @@ def self.execute(query)
   describe "ActiveRecord::SchemaDumper#dump" do
     before(:each) do
       ActiveRecord::Base.connection.drop_view(:new_product_users)
+      ActiveRecord::Base.connection.drop_view(:other_product_users)
 
       ActiveRecord::Base.connection.create_view(:new_product_users) do
         "SELECT name AS product_name, first_name AS username FROM
         products JOIN users ON users.id = products.user_id"
       end
 
+      ActiveRecord::Base.connection.create_view(:other_product_users) do
+        "SELECT name AS product_name, first_name AS username FROM
+        products JOIN users ON users.id = products.user_id"
+      end
+
       if ActiveRecord::Base.connection.supports_materialized_views?
         ActiveRecord::Base.connection.drop_materialized_view(:materialized_product_users)
         ActiveRecord::Base.connection.drop_materialized_view(:empty_materialized_product_users)