Changeset 3886

Timestamp:

03/16/06 03:00:27 (3 years ago)

Author:

david

Message:

Stop the MySQL adapter crashing when views are present. (closes #3782) [Jonathan Viney]

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (2 diffs)

trunk/activerecord/CHANGELOG

@@ -106 +106 @@
-* Documentation fixes for :dependent [robby@planetargon.com]
-
+* 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]
-

trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -237 +237 @@
-
-      def structure_dump #:nodoc:
-
+
+
+
+
+
+
+
+
-          structure += select_one("SHOW CREATE TABLE #{table.to_a.first.last}")["Create Table"] + ";\n\n"
-        end
@@ -335 +342 @@
-          rows
-        end
+        
+        def supports_views?
+          version[0] >= 5
+        end
+        
+        def version
+          @version ||= @connection.server_info.scan(/^(\d+)\.(\d+)\.(\d+)/).flatten.map { |v| v.to_i }
+        end
-    end
-  end