Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/lib/active_record/connection_adapters/jdbc_adapter.rb b/lib/active_record/connection_adapters/jdbc_adapter.rb
- index 28a828e..98aff18 100644
- --- a/lib/active_record/connection_adapters/jdbc_adapter.rb
- +++ b/lib/active_record/connection_adapters/jdbc_adapter.rb
- @@ -50,10 +50,7 @@ end
- module JdbcSpec
- module ActiveRecordExtensions
- def jdbc_connection(config)
- - connection_class = config[:jdbc_connection_class] ||
- - ::ActiveRecord::ConnectionAdapters::JdbcConnection
- - connection = connection_class.new(config)
- - ::ActiveRecord::ConnectionAdapters::JdbcAdapter.new(connection, logger, config)
- + ::ActiveRecord::ConnectionAdapters::JdbcAdapter.new(logger, config)
- end
- alias jndi_connection jdbc_connection
- @@ -464,19 +461,25 @@ module ActiveRecord
- c.adapter_selector }.inject({}) { |h,val|
- h[val[0]] = val[1]; h }
- - def initialize(connection, logger, config)
- - super(connection, logger)
- + def initialize(logger, config)
- @config = config
- + connection_class = jdbc_connection_class
- + connection = connection_class.new(config)
- + connection.adapter = self
- + super(connection, logger)
- dialect = config[:dialect] || config[:driver]
- for reg, func in ADAPTER_TYPES
- if reg === dialect.to_s
- func.call(@config,self)
- end
- end
- - connection.adapter = self
- JndiConnectionPoolCallbacks.prepare(self, connection)
- end
- + def jdbc_connection_class
- + ::ActiveRecord::ConnectionAdapters::JdbcConnection
- + end
- +
- def modify_types(tp)
- tp
- end
- diff --git a/lib/jdbc_adapter/jdbc_postgre.rb b/lib/jdbc_adapter/jdbc_postgre.rb
- index 5edf392..c89ac06 100644
- --- a/lib/jdbc_adapter/jdbc_postgre.rb
- +++ b/lib/jdbc_adapter/jdbc_postgre.rb
- @@ -10,7 +10,6 @@ module ::JdbcSpec
- config[:url] ||= "jdbc:postgresql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
- config[:url] << config[:pg_params] if config[:pg_params]
- config[:driver] ||= "org.postgresql.Driver"
- - config[:jdbc_connection_class] = ::ActiveRecord::ConnectionAdapters::PostgresJdbcConnection
- jdbc_connection(config)
- end
- end
- @@ -73,6 +72,10 @@ module ::JdbcSpec
- end
- end
- + def jdbc_connection_class
- + ::ActiveRecord::ConnectionAdapters::PostgresJdbcConnection
- + end
- +
- def modify_types(tp)
- tp[:primary_key] = "serial primary key"
- tp[:string][:limit] = 255
Add Comment
Please, Sign In to add comment