activerecord-jdbc-alt-adapter 51.7.0-java → 52.2.0-java

data/lib/arjdbc/jdbc/column.rb

@@ -26,12 +26,20 @@ module ActiveRecord
           end
         end
 
-        default = args[0].cast(default)
-
-        sql_type = args.delete_at(1)
-        type = args.delete_at(0)
-
-        args.unshift(SqlTypeMetadata.new(:sql_type => sql_type, :type => type))
+        if ArJdbc::AR52
+          # undefined method `cast' for #<ActiveRecord::ConnectionAdapters::SqlTypeMetadata> on AR52
+        elsif ArJdbc::AR50
+          default = args[0].cast(default)
+
+          sql_type = args.delete_at(1)
+          type = args.delete_at(0)
+
+          args.unshift(SqlTypeMetadata.new(:sql_type => sql_type, :type => type))
+        elsif ArJdbc::AR42
+          default = args[0].type_cast_from_database(default)
+        else
+          default = default_value(default)
+        end
 
         # super <= 4.1: (name, default, sql_type = nil, null = true)
         # super >= 4.2: (name, default, cast_type, sql_type = nil, null = true)

data/lib/arjdbc/jdbc.rb

@@ -2,8 +2,15 @@ require 'active_support/deprecation'
 
 module ArJdbc
 
+  # @private
+  AR40 = ::ActiveRecord::VERSION::MAJOR > 3
   # @private
   AR42 = ::ActiveRecord::VERSION::STRING >= '4.2'
+  # @private
+  AR50 = ::ActiveRecord::VERSION::MAJOR > 4
+
+  # @private
+  AR52 = ::ActiveRecord::VERSION::STRING >= '5.2'
 
   class << self
 

data/lib/arjdbc/mssql/adapter.rb

@@ -3,7 +3,6 @@
 ArJdbc.load_java_part :MSSQL
 
 require 'arel'
-require 'arel/visitors/bind_visitor'
 require 'arel/visitors/sqlserver'
 require 'active_record/connection_adapters/abstract_adapter'
 
@@ -27,6 +26,7 @@ require 'arjdbc/mssql/explain_support'
 require 'arjdbc/mssql/transaction'
 require 'arjdbc/mssql/errors'
 require 'arjdbc/mssql/schema_creation'
+require 'arjdbc/mssql/database_limits'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -54,9 +54,9 @@ module ActiveRecord
 
       include MSSQL::Quoting
       include MSSQL::SchemaStatements
-      include MSSQL::ColumnDumper
       include MSSQL::DatabaseStatements
       include MSSQL::ExplainSupport
+      include MSSQL::DatabaseLimits
 
       @cs_equality_operator = 'COLLATE Latin1_General_CS_AS_WS'
 
@@ -85,12 +85,6 @@ module ActiveRecord
         ::ActiveRecord::ConnectionAdapters::MSSQLColumn
       end
 
-      # Does this adapter support DDL rollbacks in transactions? That is, would
-      # CREATE TABLE or ALTER TABLE get rolled back by a transaction?
-      def supports_ddl_transactions?
-        true
-      end
-
       # Does this adapter support creating foreign key constraints?
       def supports_foreign_keys?
         true
@@ -106,16 +100,6 @@ module ActiveRecord
         true
       end
 
-      # Does this adapter support index sort order?
-      def supports_index_sort_order?
-        true
-      end
-
-      # Also known as filtered index
-      def supports_partial_index?
-        true
-      end
-
       # Does this adapter support views?
       def supports_views?
         true
@@ -132,13 +116,6 @@ module ActiveRecord
         super
       end
 
-      def reset!
-        # execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
-        # NOTE: it seems the above line interferes with the jdbc driver
-        # and ending up in connection closed, issue seen in rails 5.2 and 6.0
-        reconnect!
-      end
-
       def disable_referential_integrity
         tables = tables_with_referential_integrity
 
@@ -213,23 +190,31 @@ module ActiveRecord
       # get the collation per column basis. At the moment we only use
       # the global database collation
       def case_sensitive_comparison(table, attribute, column, value)
-        if value.nil?
-          table[attribute].eq(value)
-        elsif [:string, :text].include?(column.type) && collation && !collation.match(/_CS/)
-          table[attribute].eq(Arel::Nodes::Bin.new(Arel::Nodes::BindParam.new))
+        if [:string, :text].include?(column.type) && collation && !collation.match(/_CS/)
+          table[attribute].eq(Arel::Nodes::Bin.new(value))
         # elsif value.acts_like?(:string)
         #   table[attribute].eq(Arel::Nodes::Bin.new(Arel::Nodes::BindParam.new))
         else
-          table[attribute].eq(Arel::Nodes::BindParam.new)
+          super
         end
       end
 
       def configure_connection
-        # Here goes initial settings per connection
+        execute("SET LOCK_TIMEOUT #{lock_timeout}")
 
         set_session_transaction_isolation
       end
 
+      def lock_timeout
+        timeout = config[:lock_timeout].to_i
+
+        if timeout.positive?
+          timeout
+        else
+          5_000
+        end
+      end
+
       def set_session_transaction_isolation
         isolation_level = config[:transaction_isolation]
 
@@ -290,7 +275,7 @@ module ActiveRecord
       # This method is called indirectly by the abstract method
       # 'fetch_type_metadata' which then it is called by the java part when
       # calculating a table's columns.
-      def initialize_type_map(map)
+      def initialize_type_map(map = type_map)
         # Build the type mapping from SQL Server to ActiveRecord
 
         # Integer types.
@@ -359,6 +344,9 @@ module ActiveRecord
         register_class_with_precision map, %r{\Adatetime2\(\d+\)}i, MSSQL::Type::DateTime2
         map.register_type 'datetime2(7)',  MSSQL::Type::DateTime2.new
 
+        # TODO: we should have identity separated from the sql_type
+        # let's say in another attribute (this will help to pass more AR tests),
+        # also we add collation attribute per column.
         # aliases
         map.alias_type 'int identity',    'int'
         map.alias_type 'bigint identity', 'bigint'

data/lib/arjdbc/mssql/connection_methods.rb

@@ -52,8 +52,6 @@ ArJdbc::ConnectionMethods.module_eval do
 
   # @note Assumes SQLServer SQL-JDBC driver on the class-path.
   def sqlserver_connection(config)
-    config = config.deep_dup
-
     config[:adapter_spec] ||= ::ArJdbc::MSSQL
     config[:adapter_class] = ActiveRecord::ConnectionAdapters::MSSQLAdapter unless config.key?(:adapter_class)
 
@@ -62,15 +60,13 @@ ArJdbc::ConnectionMethods.module_eval do
     config[:host] ||= 'localhost'
     config[:driver] ||= 'com.microsoft.sqlserver.jdbc.SQLServerDriver'
     config[:connection_alive_sql] ||= 'SELECT 1'
-    config[:lock_timeout] ||= 5000
 
     config[:url] ||= begin
       url = "jdbc:sqlserver://#{config[:host]}"
       url << ( config[:port] ? ":#{config[:port]};" : ';' )
       url << "databaseName=#{config[:database]};" if config[:database]
       url << "instanceName=#{config[:instance]};" if config[:instance]
-      url << "loginTimeout=#{config[:login_timeout].to_i};" if config[:login_timeout]
-      url << "lockTimeout=#{config[:lock_timeout].to_i};"
+      url << "sendTimeAsDatetime=#{config[:send_time_as_datetime] || false};"
       app = config[:appname] || config[:application]
       url << "applicationName=#{app};" if app
       isc = config[:integrated_security] # Win only - needs sqljdbc_auth.dll

data/lib/arjdbc/mssql/database_limits.rb

@@ -0,0 +1,29 @@
+module ActiveRecord
+ module ConnectionAdapters
+   module MSSQL
+     module DatabaseLimits
+
+       # Returns the maximum number of elements in an IN (x,y,z) clause.
+       # NOTE: Could not find a limit for IN in mssql but 10000 seems to work
+       # with the active record tests
+       def in_clause_length
+         10_000
+       end
+
+       private
+
+       # the max bind params is 2100 but it seems
+       # the jdbc uses 2 for something
+       def bind_params_length
+         2_098
+       end
+
+       # max number of insert rows in mssql
+       def insert_rows_length
+         1_000
+       end
+
+     end
+   end
+ end
+end

data/lib/arjdbc/mssql/database_statements.rb

@@ -71,8 +71,48 @@ module ActiveRecord
           @connection.get_transaction_isolation
         end
 
+        def insert_fixtures_set(fixture_set, tables_to_delete = [])
+          fixture_inserts = []
+
+          fixture_set.each do |table_name, fixtures|
+            fixtures.each_slice(insert_rows_length) do |batch|
+              fixture_inserts << build_fixture_sql(batch, table_name)
+            end
+          end
+
+          table_deletes = tables_to_delete.map do |table|
+            "DELETE FROM #{quote_table_name(table)}".dup
+          end
+          total_sql = Array.wrap(combine_multi_statements(table_deletes + fixture_inserts))
+
+          disable_referential_integrity do
+            transaction(requires_new: true) do
+              total_sql.each do |sql|
+                execute sql, 'Fixtures Load'
+                yield if block_given?
+              end
+            end
+          end
+        end
+
         private
 
+        # Overrides method in abstract class, combining the sqls with semicolon
+        # affects disable_referential_integrity in mssql specially when multiple
+        # tables are involved.
+        def combine_multi_statements(total_sql)
+          total_sql
+        end
+
+        def default_insert_value(column)
+          if column.identity?
+            table_name = quote(quote_table_name(column.table_name))
+            Arel.sql("IDENT_CURRENT(#{table_name}) + IDENT_INCR(#{table_name})")
+          else
+            super
+          end
+        end
+
         def insert_sql?(sql)
           !(sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)/i).nil? 
         end
@@ -87,7 +127,7 @@ module ActiveRecord
         end
 
         def identity_column_name(table_name)
-          for column in schema_cache.columns(table_name)
+          for column in columns(table_name)
             return column.name if column.identity?
           end
           nil

data/lib/arjdbc/mssql/explain_support.rb

@@ -18,9 +18,14 @@ module ActiveRecord
         def explain(arel, binds = [])
           return if DISABLED
 
+          if arel.respond_to?(:to_sql)
+            raw_sql, raw_binds = to_sql_and_binds(arel, binds)
+          else
+            raw_sql, raw_binds = arel, binds
+          end
           # sql = to_sql(arel, binds)
           # result = with_showplan_on { exec_query(sql, 'EXPLAIN', binds) }
-           sql = interpolate_sql_statement(arel, binds)
+           sql = interpolate_sql_statement(raw_sql, raw_binds)
            result = with_showplan_on do
              exec_query(sql, 'EXPLAIN', [])
            end

data/lib/arjdbc/mssql/quoting.rb

@@ -2,6 +2,9 @@ module ActiveRecord
   module ConnectionAdapters
     module MSSQL
       module Quoting
+        QUOTED_TRUE  = '1'.freeze
+        QUOTED_FALSE = '0'.freeze
+
         # Quote date/time values for use in SQL input, includes microseconds
         # with three digits only if the value is a Time responding to usec.
         # The JDBC drivers does not work with 6 digits microseconds
@@ -29,17 +32,21 @@ module ActiveRecord
           cast_type = lookup_cast_type(column.sql_type)
           if cast_type.type == :uuid && value =~ /\(\)/
             value
+          elsif column.type == :datetime_basic && value.is_a?(String)
+            # let's trust the user to set a right default value for this
+            # legacy type something like: '2017-02-28 01:59:19.789'
+            quote(value)
           else
             super
           end
         end
 
         def quoted_true
-          1
+          QUOTED_TRUE
         end
 
         def quoted_false
-          0
+          QUOTED_FALSE
         end
 
         # @override

data/lib/arjdbc/mssql/schema_creation.rb

@@ -7,7 +7,8 @@ module ActiveRecord
         def visit_TableDefinition(o)
           if o.as
             table_name = quote_table_name(o.temporary ? "##{o.name}" : o.name)
-            projections, source = @conn.to_sql(o.as).match(%r{SELECT\s+(.*)?\s+FROM\s+(.*)?}).captures
+            query = o.as.respond_to?(:to_sql) ? o.as.to_sql : o.as
+            projections, source = query.match(%r{SELECT\s+(.*)?\s+FROM\s+(.*)?}).captures
             select_into = "SELECT #{projections} INTO #{table_name} FROM #{source}"
           else
             o.instance_variable_set :@as, nil

data/lib/arjdbc/mssql/schema_dumper.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module MSSQL
-      module ColumnDumper # :nodoc:
+      class SchemaDumper < ConnectionAdapters::SchemaDumper
         MSSQL_NO_LIMIT_TYPES = [
           'text',
           'ntext',

data/lib/arjdbc/mssql/schema_statements.rb

@@ -46,9 +46,13 @@ module ActiveRecord
         # NOTE: This is ready, all implemented in the java part of adapter,
         # it uses MSSQLColumn, SqlTypeMetadata, etc.
         def columns(table_name)
-          log('JDBC: GETCOLUMNS', 'SCHEMA') { @connection.columns(table_name) }
+          @connection.columns(table_name)
         rescue => e
-          raise translate_exception_class(e, nil)
+          # raise translate_exception_class(e, nil)
+          # FIXME: this breaks one arjdbc test but fixes activerecord tests
+          # (table name alias). Also it behaves similarly to the CRuby adapter
+          # which returns an empty array too. (postgres throws a exception)
+          []
         end
 
         # Returns an array of indexes for the given table.
@@ -213,7 +217,11 @@ module ActiveRecord
                .gsub(/\s+NULLS\s+(?:FIRST|LAST)\b/i, '')
             }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" }
 
-          [super, *order_columns].join(', ')
+          (order_columns << super).join(', ')
+        end
+
+        def create_schema_dumper(options)
+          MSSQL::SchemaDumper.create(self, options)
         end
 
         def rename_column(table_name, column_name, new_column_name)

data/lib/arjdbc/mssql/transaction.rb

@@ -25,7 +25,7 @@ module ActiveRecord
       module RealTransactionExt
         attr_reader :initial_transaction_isolation
 
-        def initialize(connection, options, run_commit_callbacks: false)
+        def initialize(connection, options, *args)
           @connection = connection
 
           if options[:isolation]
@@ -58,11 +58,11 @@ module ActiveRecord
     end
 
     class Transaction
-      include MSSQL::TransactionExt
+      prepend MSSQL::TransactionExt
     end
 
     class RealTransaction
-      include MSSQL::RealTransactionExt
+      prepend MSSQL::RealTransactionExt
     end
 
   end

data/lib/arjdbc/mssql.rb

@@ -4,4 +4,4 @@ require 'arjdbc/mssql/connection_methods'
 module ArJdbc
   MsSQL = MSSQL # compatibility with 1.2
 end
-ArJdbc.warn_unsupported_adapter 'mssql', [5, 1] # warns on AR >= 4.2
+ArJdbc.warn_unsupported_adapter 'mssql', [5, 2] # warns on AR >= 4.2

data/lib/arjdbc/mysql/adapter.rb

@@ -65,6 +65,10 @@ module ActiveRecord
         true
       end
 
+      def supports_set_server_option?
+        false
+      end
+
       # HELPER METHODS ===========================================
 
       # Reloading the type map in abstract/statement_cache.rb blows up postgres
@@ -90,10 +94,6 @@ module ActiveRecord
         exception.error_code if exception.is_a?(JDBCError)
       end
 
-      def create_table(table_name, **options) #:nodoc:
-        super(table_name, options: "ENGINE=InnoDB", **options)
-      end
-
       #--
       # QUOTING ==================================================
       #+
@@ -146,6 +146,22 @@ module ActiveRecord
         ::ActiveRecord::ConnectionAdapters::MySQL::Column
       end
 
+      # defined in MySQL::DatabaseStatements which is not included
+      def default_insert_value(column)
+        Arel.sql("DEFAULT") unless column.auto_increment?
+      end
+
+      # FIXME: optimize insert_fixtures_set by using JDBC Statement.addBatch()/executeBatch()
+      def combine_multi_statements(total_sql)
+        total_sql
+      end
+
+      def with_multi_statements
+        yield
+      end
+
+      def discard_remaining_results
+      end
     end
   end
 end

data/lib/arjdbc/mysql/connection_methods.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 ArJdbc::ConnectionMethods.module_eval do
   def mysql_connection(config)
-    config = config.deep_dup
     # NOTE: this isn't "really" necessary but Rails (in tests) assumes being able to :
     #   ActiveRecord::Base.mysql2_connection ActiveRecord::Base.configurations['arunit'].merge(database: ...)
     config = symbolize_keys_if_necessary(config)
@@ -11,9 +10,11 @@ ArJdbc::ConnectionMethods.module_eval do
 
     return jndi_connection(config) if jndi_config?(config)
 
-    driver = config[:driver]
-    mysql_driver = driver.nil? || driver.to_s.start_with?('com.mysql.')
-    mariadb_driver = ! mysql_driver && driver.to_s.start_with?('org.mariadb.')
+    driver = config[:driver] ||=
+      defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'
+
+    mysql_driver = driver.start_with?('com.mysql.')
+    mariadb_driver = ! mysql_driver && driver.start_with?('org.mariadb.')
 
     begin
       require 'jdbc/mysql'
@@ -21,11 +22,6 @@ ArJdbc::ConnectionMethods.module_eval do
     rescue LoadError # assuming driver.jar is on the class-path
     end if mysql_driver
 
-    if driver.nil?
-      config[:driver] ||=
-        defined?(::Jdbc::MySQL.driver_name) ? ::Jdbc::MySQL.driver_name : 'com.mysql.jdbc.Driver'
-    end
-
     config[:username] = 'root' unless config.key?(:username)
     # jdbc:mysql://[host][,failoverhost...][:port]/[database]
     # - if the host name is not specified, it defaults to 127.0.0.1
@@ -40,8 +36,7 @@ ArJdbc::ConnectionMethods.module_eval do
 
     properties = ( config[:properties] ||= {} )
     if mysql_driver
-      properties['zeroDateTimeBehavior'] ||=
-        config[:driver].to_s.start_with?('com.mysql.cj.') ? 'CONVERT_TO_NULL' : 'convertToNull'
+      properties['zeroDateTimeBehavior'] ||= 'convertToNull'
       properties['jdbcCompliantTruncation'] ||= false
       # NOTE: this is "better" than passing what users are used to set on MRI
       # e.g. 'utf8mb4' will fail cause the driver will check for a Java charset
@@ -113,8 +108,7 @@ ArJdbc::ConnectionMethods.module_eval do
     rescue LoadError # assuming driver.jar is on the class-path
     end
 
-    config[:driver] ||=
-      defined?(::Jdbc::MariaDB.driver_name) ? ::Jdbc::MariaDB.driver_name : 'org.mariadb.jdbc.Driver'
+    config[:driver] ||= 'org.mariadb.jdbc.Driver'
 
     mysql_connection(config)
   end

data/lib/arjdbc/postgresql/adapter.rb

@@ -8,6 +8,7 @@ require 'active_record/connection_adapters/postgresql/explain_pretty_printer'
 require 'active_record/connection_adapters/postgresql/quoting'
 require 'active_record/connection_adapters/postgresql/referential_integrity'
 require 'active_record/connection_adapters/postgresql/schema_creation'
+require 'active_record/connection_adapters/postgresql/schema_definitions'
 require 'active_record/connection_adapters/postgresql/schema_dumper'
 require 'active_record/connection_adapters/postgresql/schema_statements'
 require 'active_record/connection_adapters/postgresql/type_metadata'
@@ -30,9 +31,6 @@ module ArJdbc
     # @private
     IndexDefinition = ::ActiveRecord::ConnectionAdapters::IndexDefinition
 
-    # @private
-    ForeignKeyDefinition = ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition
-
     # @private
     Type = ::ActiveRecord::Type
 
@@ -50,7 +48,6 @@ module ArJdbc
       ADAPTER_NAME
     end
 
-    # TODO: Update this to pull info from the DatabaseMetaData object?
     def postgresql_version
       @postgresql_version ||=
         begin
@@ -247,6 +244,8 @@ module ArJdbc
 
     def supports_foreign_keys?; true end
 
+    def supports_validate_constraints?; true end
+
     def supports_index_sort_order?; true end
 
     def supports_partial_index?; true end
@@ -257,6 +256,8 @@ module ArJdbc
 
     def supports_views?; true end
 
+    def supports_bulk_alter?; true end    
+
     def supports_datetime_with_precision?; true end
 
     def supports_comments?; true end
@@ -267,6 +268,10 @@ module ArJdbc
       @standard_conforming_strings != :unsupported
     end
 
+    def supports_foreign_tables? # we don't really support this yet, its a reminder :)
+      postgresql_version >= 90300
+    end
+
     def supports_hex_escaped_bytea?
       postgresql_version >= 90000
     end
@@ -374,8 +379,8 @@ module ArJdbc
     end
 
     def explain(arel, binds = [])
-      sql = "EXPLAIN #{to_sql(arel, binds)}"
-      ActiveRecord::ConnectionAdapters::PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query(sql, 'EXPLAIN', binds))
+      sql, binds = to_sql_and_binds(arel, binds)
+      ActiveRecord::ConnectionAdapters::PostgreSQL::ExplainPrettyPrinter.new.pp(exec_query("EXPLAIN #{sql}", 'EXPLAIN', binds))
     end
 
     # @note Only for "better" AR 4.0 compatibility.
@@ -435,10 +440,8 @@ module ArJdbc
 
     # Set the client message level.
     def client_min_messages=(level)
-      # NOTE: for now simply ignore the writer (no warn on Redshift) so that
-      # the AR copy-pasted PpstgreSQL parts stay the same as much as possible
-      return nil if redshift? # not supported on Redshift
-      execute("SET client_min_messages TO '#{level}'", 'SCHEMA')
+      # Not supported on Redshift
+      redshift? ? nil : super
     end
 
     # ORDER BY clause for the passed order option.
@@ -580,6 +583,10 @@ module ArJdbc
         ::ActiveRecord::SerializationFailure.new(message)
       when /deadlock detected/
         ::ActiveRecord::Deadlocked.new(message)
+      when /lock timeout/
+        ::ActiveRecord::LockWaitTimeout.new(message)
+      when /canceling statement/ # This needs to come after lock timeout because the lock timeout message also contains "canceling statement"
+        ::ActiveRecord::QueryCanceled.new(message)
       else
         super
       end
@@ -612,6 +619,10 @@ module ArJdbc
       @local_tz ||= execute('SHOW TIME ZONE', 'SCHEMA').first["TimeZone"]
     end
 
+    def bind_params_length
+      32767
+    end
+
   end
 end
 
@@ -627,7 +638,6 @@ module ActiveRecord::ConnectionAdapters
 
     # Try to use as much of the built in postgres logic as possible
     # maybe someday we can extend the actual adapter
-    include ActiveRecord::ConnectionAdapters::PostgreSQL::ColumnDumper
     include ActiveRecord::ConnectionAdapters::PostgreSQL::ReferentialIntegrity
     include ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaStatements
     include ActiveRecord::ConnectionAdapters::PostgreSQL::Quoting
@@ -658,7 +668,8 @@ module ActiveRecord::ConnectionAdapters
 
       super(connection, logger, config) # configure_connection happens in super
 
-      initialize_type_map(@type_map = Type::HashLookupTypeMap.new)
+      @type_map = Type::HashLookupTypeMap.new
+      initialize_type_map
 
       @use_insert_returning = @config.key?(:insert_returning) ?
         self.class.type_cast_config_to_boolean(@config[:insert_returning]) : nil
@@ -680,14 +691,6 @@ module ActiveRecord::ConnectionAdapters
 
     public :sql_for_insert
 
-    def schema_creation # :nodoc:
-      PostgreSQL::SchemaCreation.new self
-    end
-
-    def update_table_definition(table_name, base)
-      Table.new(table_name, base)
-    end
-
     def jdbc_connection_class(spec)
       ::ArJdbc::PostgreSQL.jdbc_connection_class
     end

data/lib/arjdbc/postgresql/column.rb

@@ -15,7 +15,7 @@ module ArJdbc
       end
 
       # Extracts the value from a PostgreSQL column default definition.
-      def extract_value_from_default(default)
+      def extract_value_from_default(default) # :nodoc:
         case default
           # Quoted types
           when /\A[\(B]?'(.*)'.*::"?([\w. ]+)"?(?:\[\])?\z/m
@@ -41,13 +41,10 @@ module ArJdbc
         end
       end
 
-      def extract_default_function(default_value, default)
-        default if has_default_function?(default_value, default)
+      def extract_default_function(default_value, default) # :nodoc:
+        default if ! default_value && ( %r{\w+\(.*\)|\(.*\)::\w+} === default )
       end
 
-      def has_default_function?(default_value, default)
-        !default_value && %r{\w+\(.*\)|\(.*\)::\w+|CURRENT_DATE|CURRENT_TIMESTAMP} === default
-      end
     end
 
   end