Guest User

Untitled

a guest
Jun 5th, 2018
94
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.54 KB | None | 0 0
  1. diff --git a/lib/active_record/connection_adapters/jdbc_adapter.rb b/lib/active_record/connection_adapters/jdbc_adapter.rb
  2. index 28a828e..98aff18 100644
  3. --- a/lib/active_record/connection_adapters/jdbc_adapter.rb
  4. +++ b/lib/active_record/connection_adapters/jdbc_adapter.rb
  5. @@ -50,10 +50,7 @@ end
  6. module JdbcSpec
  7. module ActiveRecordExtensions
  8. def jdbc_connection(config)
  9. - connection_class = config[:jdbc_connection_class] ||
  10. - ::ActiveRecord::ConnectionAdapters::JdbcConnection
  11. - connection = connection_class.new(config)
  12. - ::ActiveRecord::ConnectionAdapters::JdbcAdapter.new(connection, logger, config)
  13. + ::ActiveRecord::ConnectionAdapters::JdbcAdapter.new(logger, config)
  14. end
  15. alias jndi_connection jdbc_connection
  16.  
  17. @@ -464,19 +461,25 @@ module ActiveRecord
  18. c.adapter_selector }.inject({}) { |h,val|
  19. h[val[0]] = val[1]; h }
  20.  
  21. - def initialize(connection, logger, config)
  22. - super(connection, logger)
  23. + def initialize(logger, config)
  24. @config = config
  25. + connection_class = jdbc_connection_class
  26. + connection = connection_class.new(config)
  27. + connection.adapter = self
  28. + super(connection, logger)
  29. dialect = config[:dialect] || config[:driver]
  30. for reg, func in ADAPTER_TYPES
  31. if reg === dialect.to_s
  32. func.call(@config,self)
  33. end
  34. end
  35. - connection.adapter = self
  36. JndiConnectionPoolCallbacks.prepare(self, connection)
  37. end
  38.  
  39. + def jdbc_connection_class
  40. + ::ActiveRecord::ConnectionAdapters::JdbcConnection
  41. + end
  42. +
  43. def modify_types(tp)
  44. tp
  45. end
  46. diff --git a/lib/jdbc_adapter/jdbc_postgre.rb b/lib/jdbc_adapter/jdbc_postgre.rb
  47. index 5edf392..c89ac06 100644
  48. --- a/lib/jdbc_adapter/jdbc_postgre.rb
  49. +++ b/lib/jdbc_adapter/jdbc_postgre.rb
  50. @@ -10,7 +10,6 @@ module ::JdbcSpec
  51. config[:url] ||= "jdbc:postgresql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
  52. config[:url] << config[:pg_params] if config[:pg_params]
  53. config[:driver] ||= "org.postgresql.Driver"
  54. - config[:jdbc_connection_class] = ::ActiveRecord::ConnectionAdapters::PostgresJdbcConnection
  55. jdbc_connection(config)
  56. end
  57. end
  58. @@ -73,6 +72,10 @@ module ::JdbcSpec
  59. end
  60. end
  61.  
  62. + def jdbc_connection_class
  63. + ::ActiveRecord::ConnectionAdapters::PostgresJdbcConnection
  64. + end
  65. +
  66. def modify_types(tp)
  67. tp[:primary_key] = "serial primary key"
  68. tp[:string][:limit] = 255
Add Comment
Please, Sign In to add comment