Changeset 8969

Timestamp:

03/02/08 04:42:10 (8 months ago)

Author:

nzkoz

Message:

Make the mysql schema dumper roundtrip the limits of text/blob columns. Closes #7424 [will.bryant]

Files:

• trunk/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb (modified) (1 diff)
• trunk/activerecord/test/cases/schema_dumper_test.rb (modified) (1 diff)
• trunk/activerecord/test/schema/schema.rb (modified) (1 diff)

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

@@ -111 +111 @@
-          return :string  if field_type =~ /enum/i
-          super
+        end
+
+        def extract_limit(sql_type)
+          if sql_type =~ /blob|text/i
+            case sql_type
+            when /tiny/i
+              255
+            when /medium/i
+              16777215
+            when /long/i
+              2147483647 # mysql only allows 2^31-1, not 2^32-1, somewhat inconsistently with the tiny/medium/normal cases
+            else
+              super # we could return 65535 here, but we leave it undecorated by default
+            end
+          else
+            super
+          end
-        end
-

trunk/activerecord/test/cases/schema_dumper_test.rb

@@ -116 +116 @@
-        assert_match %r(:primary_key => "movieid"), match[1], "non-standard primary key not preserved"
-      end
+
+      def test_schema_dump_includes_length_for_mysql_blob_and_text_fields
+        output = standard_dump
+        assert_match %r{t.binary\s+"tiny_blob",\s+:limit => 255$}, output
+        assert_match %r{t.binary\s+"normal_blob"$}, output
+        assert_match %r{t.binary\s+"medium_blob",\s+:limit => 16777215$}, output
+        assert_match %r{t.binary\s+"long_blob",\s+:limit => 2147483647$}, output
+        assert_match %r{t.text\s+"tiny_text",\s+:limit => 255$}, output
+        assert_match %r{t.text\s+"normal_text"$}, output
+        assert_match %r{t.text\s+"medium_text",\s+:limit => 16777215$}, output
+        assert_match %r{t.text\s+"long_text",\s+:limit => 2147483647$}, output
+      end
-    end
-

trunk/activerecord/test/schema/schema.rb

@@ -24 +24 @@
-    create_table :binaries, :force => true do |t|
-      t.binary :data
+    end
+
+    create_table :binary_fields, :force => true do |t|
+      t.binary :tiny_blob,   :limit => 255
+      t.binary :normal_blob, :limit => 65535
+      t.binary :medium_blob, :limit => 16777215
+      t.binary :long_blob,   :limit => 2147483647
+      t.text   :tiny_text,   :limit => 255
+      t.text   :normal_text, :limit => 65535
+      t.text   :medium_text, :limit => 16777215
+      t.text   :long_text,   :limit => 2147483647
-    end
-