Ticket #3782: fix_crash_with_mysql_views.patch

activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -236 +236 @@
-      # SCHEMA STATEMENTS ========================================
-
-      def structure_dump #:nodoc:
-
+
+
+
+
+
+
+
+
-          structure += select_one("SHOW CREATE TABLE #{table.to_a.first.last}")["Create Table"] + ";\n\n"
-        end
-      end
@@ -334 +341 @@
-          result.free
-          rows
-        end
+        
+        def supports_views?
+          version[0] >= 5
+        end
+        
+        def version
+          @version ||= select_one("SELECT VERSION()")['VERSION()'].scan(/^(\d)\.(\d)\.(\d{1,2})/).flatten.map { |v| v.to_i }
+        end
-    end
-  end
-end

activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+* Stop the MySQL adapter crashing when views are present. #3782 [Jonathan Viney]
+
-* Allow set_fixture_class to take Classes instead of strings for a class in a module.  Raise FixtureClassNotFound if a fixture can't load.  [Rick Olson]
-
-* Fix quoting of inheritance column for STI eager loading #4098 [Jonathan Viney <jonathan@bluewire.net.nz>]