Merge pull request #15504 from sgrif/sg-postgres-defaults

Collapse PG default extractoin of most types to single regex

2 files changed, 11 insertions, 48 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 67570dad3c..0f20d52879 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -511,58 +511,16 @@ module ActiveRecord
           # makes this method very very slow.
           return default unless default
 
-          # TODO: The default extraction is related to the cast-type.
-          # we should probably make a type_map lookup and cast the default-
-          # expression accordingly
-          if oid.type == :enum && default =~ /\A'(.*)'::/
-            return $1
-          end
-
           case default
-            when /\A'(.*)'::(num|date|tstz|ts|int4|int8)range\z/m
-              $1
+            # Quoted types
+            when /\A[\(B]?'(.*)'::/m
+              $1.gsub(/''/, "'")
+            # Boolean types
+            when 'true', 'false'
+              default
             # Numeric types
             when /\A\(?(-?\d+(\.\d*)?\)?(::bigint)?)\z/
               $1
-            # Character types
-            when /\A\(?'(.*)'::.*\b(?:character varying|bpchar|text)\z/m
-              $1.gsub(/''/, "'")
-            # Binary data types
-            when /\A'(.*)'::bytea\z/m
-              $1
-            # Date/time types
-            when /\A'(.+)'::(?:time(?:stamp)? with(?:out)? time zone|date)\z/
-              $1
-            when /\A'(.*)'::interval\z/
-              $1
-            # Boolean type
-            when 'true'
-              true
-            when 'false'
-              false
-            # Geometric types
-            when /\A'(.*)'::(?:point|line|lseg|box|"?path"?|polygon|circle)\z/
-              $1
-            # Network address types
-            when /\A'(.*)'::(?:cidr|inet|macaddr)\z/
-              $1
-            # Bit string types
-            when /\AB'(.*)'::"?bit(?: varying)?"?\z/
-              $1
-            # XML type
-            when /\A'(.*)'::xml\z/m
-              $1
-            # Arrays
-            when /\A'(.*)'::"?\D+"?\[\]\z/
-              $1
-            # Hstore
-            when /\A'(.*)'::hstore\z/
-              $1
-            # JSON
-            when /\A'(.*)'::json\z/
-              $1
-            when /\A'(.*)'::money\z/
-              $1
             # Object identifier types
             when /\A-?\d+\z/
               $1
diff --git a/activerecord/test/cases/defaults_test.rb b/activerecord/test/cases/defaults_test.rb
index f885a8cbc0..92144bc802 100644
--- a/activerecord/test/cases/defaults_test.rb
+++ b/activerecord/test/cases/defaults_test.rb
@@ -206,6 +206,11 @@ if current_adapter?(:PostgreSQLAdapter)
       assert_equal "some text", Default.new.text_col, "Default of text column was not correctly parse after updating default using '::text' since postgreSQL will add parens to the default in db"
     end
 
+    def test_default_containing_quote_and_colons
+      @connection.execute "ALTER TABLE defaults ALTER COLUMN string_col SET DEFAULT 'foo''::bar'"
+      assert_equal "foo'::bar", Default.new.string_col
+    end
+
     teardown do
       @connection.schema_search_path = @old_search_path
       Default.reset_column_information