Permalink
Browse files

Revert "Merge pull request #23346 from kamipo/refactor_oid_money_prec…

…ision"

This reverts commit ff835f9, reversing
changes made to c4d85df.

Reason: This broke the tests. We will add back after investigated.
  • Loading branch information...
rafaelfranca committed Jan 30, 2016
1 parent a592127 commit a398cd0bcbd39998f1b0313e6fe3f04bf491b3db
@@ -3,14 +3,12 @@ module ConnectionAdapters
module PostgreSQL
module OID # :nodoc:
class Money < Type::Decimal # :nodoc:
class_attribute :precision
def type
:money
end
def precision
19
end
def scale
2
end
@@ -213,7 +213,7 @@ def initialize(connection, logger, connection_parameters, config)
@statements = StatementPool.new @connection,
self.class.type_cast_config_to_integer(config.fetch(:statement_limit) { 1000 })
if postgresql_version < 80300
if postgresql_version < 80200
raise "Your version of PostgreSQL (#{postgresql_version}) is too old, please upgrade!"
end
@@ -645,6 +645,12 @@ def prepare_statement(sql)
# connected server's characteristics.
def connect
@connection = PGconn.connect(@connection_parameters)
# Money type has a fixed precision of 10 in PostgreSQL 8.2 and below, and as of
# PostgreSQL 8.3 it has a fixed precision of 19. PostgreSQLColumn.extract_precision
# should know about this but can't detect it there, so deal with it here.
OID::Money.precision = (postgresql_version >= 80300) ? 19 : 10
configure_connection
rescue ::PG::Error => error
if error.message.include?("does not exist")

0 comments on commit a398cd0

Please sign in to comment.