Ticket #8049: functionally_improve_postgresql_adapter.diff

activerecord/test/datatype_test_postgresql.rb

@@ -1 +1 @@
-require 'abstract_unit'
-
-Datatype
+Array
-end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  self.use_transactional_fixtures = false
-
-  TABLE_NAME = 'postgresql_datatypes'
-  COLUMNS = [
-    'id SERIAL PRIMARY KEY',
-    'commission_by_quarter INTEGER[]',
-    'nicknames TEXT[]'
-  ]
-
-  def setup
-    @connection = ActiveRecord::Base.connection
-    @connection.execute "CREATE TABLE #{TABLE_NAME} (#{COLUMNS.join(',')})"
-    @connection.execute "INSERT INTO #{TABLE_NAME} (commission_by_quarter, nicknames) VALUES ( '{35000,21000,18000,17000}', '{foo,bar,baz}' )"
-    @first = PostgresqlDatatype.find( 1 )
-  end
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
-  def test_data_type_of_array_types
-.column_for_attribute("commission_by_quarter"
-.column_for_attribute("nicknames"
+_array.column_for_attribute(:commission_by_quarter
+_array.column_for_attribute(:nicknames
-  end
-
+  def test_data_type_of_money_types
+    assert_equal :decimal, @first_money.column_for_attribute(:wealth).type
+  end
+
+  def test_data_type_of_number_types
+    assert_equal :float, @first_number.column_for_attribute(:single).type
+    assert_equal :float, @first_number.column_for_attribute(:double).type
+  end
+
+  def test_data_type_of_time_types
+    assert_equal :string, @first_time.column_for_attribute(:time_interval).type
+  end
+
+  def test_data_type_of_network_address_types
+    assert_equal :string, @first_network_address.column_for_attribute(:cidr_address).type
+    assert_equal :string, @first_network_address.column_for_attribute(:inet_address).type
+    assert_equal :string, @first_network_address.column_for_attribute(:mac_address).type
+  end
+
+  def test_data_type_of_bit_string_types
+    assert_equal :string, @first_bit_string.column_for_attribute(:bit_string).type
+    assert_equal :string, @first_bit_string.column_for_attribute(:bit_string_varying).type
+  end
+
+  def test_data_type_of_oid_types
+    assert_equal :integer, @first_oid.column_for_attribute(:obj_id).type
+  end
+
-  def test_array_values
- assert_equal '{35000,21000,18000,17000}', @first
- assert_equal '{foo,bar,baz}', @first
+assert_equal '{35000,21000,18000,17000}', @first_array
+assert_equal '{foo,bar,baz}', @first_array
-  end
-
+  def test_money_values
+    assert_equal 567.89, @first_money.wealth
+    assert_equal -567.89, @second_money.wealth
+  end
+
+  def test_number_values
+    assert_equal 123.456, @first_number.single
+    assert_equal 123456.789, @first_number.double
+  end
+
+  def test_time_values
+    assert_equal '-1 years -2 days', @first_time.time_interval
+  end
+
+  def test_network_address_values
+    assert_equal '192.168.0.0/24', @first_network_address.cidr_address
+    assert_equal '172.16.1.254', @first_network_address.inet_address
+    assert_equal '01:23:45:67:89:0a', @first_network_address.mac_address
+  end
+
+  def test_bit_string_values
+    assert_equal '00010101', @first_bit_string.bit_string
+    assert_equal '00010101', @first_bit_string.bit_string_varying
+  end
+
+  def test_oid_values
+    assert_equal 1234, @first_oid.obj_id
+  end
+
-  def test_update_integer_array
-    new_value = '{32800,95000,29350,17000}'
-    assert @first.commission_by_quarter = new_value
-    assert @first.save
-    assert @first.reload
-    assert_equal @first.commission_by_quarter, new_value
+    assert @first_array.commission_by_quarter = new_value
+    assert @first_array.save
+    assert @first_array.reload
+    assert_equal @first_array.commission_by_quarter, new_value
-  end
-
-  def test_update_text_array
@@ -48 +136 @@
-    assert @first.save
-    assert @first.reload
-    assert_equal @first.nicknames, new_value
+    assert @first_array.nicknames = new_value
+    assert @first_array.save
+    assert @first_array.reload
+    assert_equal @first_array.nicknames, new_value
-  end
+
+  def test_update_money
+    new_value = 123.45
+    assert @first_money.wealth = new_value
+    assert @first_money.save
+    assert @first_money.reload
+    assert_equal @first_money.wealth, new_value
+  end
+
+  def test_update_number
+    new_single = 789.012
+    new_double = 789012.345
+    assert @first_number.single = new_single
+    assert @first_number.double = new_double
+    assert @first_number.save
+    assert @first_number.reload
+    assert_equal @first_number.single, new_single
+    assert_equal @first_number.double, new_double
+  end
+
+  def test_update_time
+    assert @first_time.time_interval = '2 years 3 minutes'
+    assert @first_time.save
+    assert @first_time.reload
+    assert_equal @first_time.time_interval, '2 years 00:03:00'
+  end
+
+  def test_update_network_address
+    new_cidr_address = '10.1.2.3/32'
+    new_inet_address = '10.0.0.0/8'
+    new_mac_address = 'bc:de:f0:12:34:56'
+    assert @first_network_address.cidr_address = new_cidr_address
+    assert @first_network_address.inet_address = new_inet_address
+    assert @first_network_address.mac_address = new_mac_address
+    assert @first_network_address.save
+    assert @first_network_address.reload
+    assert_equal @first_network_address.cidr_address, new_cidr_address
+    assert_equal @first_network_address.inet_address, new_inet_address
+    assert_equal @first_network_address.mac_address, new_mac_address
+  end
+
+  def test_update_bit_string
+    new_bit_string = '11111111'
+    new_bit_string_varying = 'FF'
+    assert @first_bit_string.bit_string = new_bit_string
+    assert @first_bit_string.bit_string_varying = new_bit_string_varying
+    assert @first_bit_string.save
+    assert @first_bit_string.reload
+    assert_equal @first_bit_string.bit_string, new_bit_string
+    assert_equal @first_bit_string.bit_string, @first_bit_string.bit_string_varying
+  end
+
+  def test_update_oid
+    new_value = 567890
+    assert @first_oid.obj_id = new_value
+    assert @first_oid.save
+    assert @first_oid.reload
+    assert_equal @first_oid.obj_id, new_value
+  end
-end

activerecord/test/finder_test.rb

@@ -267 +267 @@
-  end
-
-  def test_bind_enumerable
+    quoted_abc = %(#{ActiveRecord::Base.connection.quote('a')},#{ActiveRecord::Base.connection.quote('b')},#{ActiveRecord::Base.connection.quote('c')})
+
-    assert_equal '1,2,3', bind('?', [1, 2, 3])
-%('a','b','c')
+quoted_abc
-
-    assert_equal '1,2,3', bind(':a', :a => [1, 2, 3])
-%('a','b','c')
+quoted_abc
-
-    require 'set'
-    assert_equal '1,2,3', bind('?', Set.new([1, 2, 3]))
-%('a','b','c')
+quoted_abc
-
-    assert_equal '1,2,3', bind(':a', :a => Set.new([1, 2, 3]))
-%('a','b','c')
+quoted_abc
-  end
-
-  def test_bind_empty_enumerable
@@ -289 +291 @@
-  end
-
-  def test_bind_string
-"''"
+ActiveRecord::Base.connection.quote('')
-  end
-
-  def test_bind_record
@@ -301 +303 @@
-  end
-
-  def test_string_sanitation
-
-
+#{ActiveRecord::Base.connection.quoted_string_prefix}
+#{ActiveRecord::Base.connection.quoted_string_prefix}
-  end
-
-  def test_count

activerecord/test/fixtures/db_definitions/postgresql.sql

@@ -245 +245 @@
- "monkeyID" INTEGER PRIMARY KEY,
- "fleaCount" INTEGER
-);
+
+CREATE TABLE postgresql_arrays (
+  id SERIAL PRIMARY KEY,
+  commission_by_quarter INTEGER[],
+  nicknames TEXT[]
+);
+
+CREATE TABLE postgresql_moneys (
+  id SERIAL PRIMARY KEY,
+  wealth MONEY
+);
+
+CREATE TABLE postgresql_numbers (
+  id SERIAL PRIMARY KEY,
+  single REAL,
+  double DOUBLE PRECISION
+);
+
+CREATE TABLE postgresql_times (
+  SERIAL PRIMARY KEY,
+  time_interval INTERVAL
+);
+
+CREATE TABLE postgresql_network_addresses (
+  id SERIAL PRIMARY KEY,
+  cidr_address CIDR,
+  inet_address INET,
+  mac_address MACADDR
+);
+
+CREATE TABLE postgresql_bit_strings (
+  id SERIAL PRIMARY KEY,
+  bit_string BIT(8),
+  bit_string_varying BIT VARYING(8)
+);
+
+CREATE TABLE postgresql_oids (
+  id SERIAL PRIMARY KEY,
+  obj_id OID
+);

activerecord/test/fixtures/db_definitions/postgresql.drop.sql

@@ -35 +35 @@
-DROP TABLE numeric_data;
-DROP TABLE column_data;
-DROP TABLE mixed_case_monkeys;
+DROP TABLE postgresql_arrays;
+DROP TABLE postgresql_moneys;
+DROP TABLE postgresql_numbers;
+DROP TABLE postgresql_times;
+DROP TABLE postgresql_network_addresses;
+DROP TABLE postgresql_bit_strings;
+DROP TABLE postgresql_oids;

activerecord/lib/active_record/connection_adapters/abstract/quoting.rb

@@ -11 +11 @@
-          when String, ActiveSupport::Multibyte::Chars
-            value = value.to_s
-            if column && column.type == :binary && column.class.respond_to?(:string_to_binary)
-
+#{quoted_string_prefix}
-            elsif column && [:integer, :float].include?(column.type)
-              value = column.type == :integer ? value.to_i : value.to_f
-              value.to_s
-            else
-
+#{quoted_string_prefix}
-            end
-          when NilClass                 then "NULL"
-          when TrueClass                then (column && column.type == :integer ? '1' : quoted_true)
@@ -28 +28 @@
-            if value.acts_like?(:date) || value.acts_like?(:time)
-              "'#{quoted_date(value)}'"
-            else
-
+#{quoted_string_prefix}
-            end
-        end
-      end
@@ -56 +56 @@
-      def quoted_date(value)
-        value.to_s(:db)
-      end
+
+      def quoted_string_prefix
+        ''
+      end
-    end
-  end
-end

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -12 +12 @@
-      username = config[:username].to_s
-      password = config[:password].to_s
-
-      min_messages = config[:min_messages]
-
-      if config.has_key?(:database)
-        database = config[:database]
-      else
-        raise ArgumentError, "No database specified. Missing argument: database."
-      end
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-  end
-
-  module ConnectionAdapters
-C-based (http://www.postgresql.jp/interfaces/ruby/) and the Ruby-bas
-(available both as gem and from http://rubyforge.org/frs/?group_id=234&release_id=1145
+native C (http://ruby.scripting.ca/postgres/) and the pur
+Ruby (available both as gem and from http://rubyforge.org/frs/?group_id=234&release_id=1944
-    #
-    # Options:
-    #
@@ -48 +221 @@
-    # * <tt>:min_messages</tt> -- An optional client min messages that is using in a SET client_min_messages TO <min_messages> call on connection.
-    # * <tt>:allow_concurrency</tt> -- If true, use async query methods so Ruby threads don't deadlock; otherwise, use blocking query methods.
-    class PostgreSQLAdapter < AbstractAdapter
+      # Returns 'PostgreSQL' as adapter name for identification purposes.
-      def adapter_name
-        'PostgreSQL'
-      end
-
-
+
+
-        super(connection, logger)
-fig =
+nection_parameters, @config = connection_parameters,
-
-
-
-
-
+
-      end
-
-      # Is this connection alive and ready for queries?
@@ -67 +239 @@
-        if @connection.respond_to?(:status)
-          @connection.status == PGconn::CONNECTION_OK
-        else
+          # We're asking the driver, not ActiveRecord, so use @connection.query instead of #query
-          @connection.query 'SELECT 1'
-          true
-        end
- is available
+ection is available.
-      rescue PGError, NoMethodError
-        false
-      end
-
-      # Close then reopen the connection.
-      def reconnect!
-        # TODO: postgres-pr doesn't have PGconn#reset.
-        if @connection.respond_to?(:reset)
-          @connection.reset
-          configure_connection
+        else
+          disconnect!
+          connect
-        end
-      end
-
+      # Close the connection.
-      def disconnect!
-        # Both postgres and postgres-pr respond to :close
-        @connection.close rescue nil
-      end
-
-
+ #:nodoc:
-        {
-          :primary_key => "serial primary key",
-          :string      => { :name => "character varying", :limit => 255 },
@@ -106 +281 @@
-        }
-      end
-
+      # Does PostgreSQL support migrations?
-      def supports_migrations?
-        true
-      end
-
+      # Does PostgreSQL support standard conforming strings?
+      def supports_standard_conforming_strings?
+        # Temporarily set the client message level above error to prevent unintentional
+        # error messages in the logs when working on a PostgreSQL database server that
+        # does not support standard conforming strings.
+        client_min_messages_old = client_min_messages
+        self.client_min_messages = 'panic'
+
+        # postgres-pr does not raise an exception when client_min_messages is set higher
+        # than error and "SHOW standard_conforming_strings" fails, but returns an empty
+        # PGresult instead.
+        has_support = execute('SHOW standard_conforming_strings')[0][0] rescue false
+        self.client_min_messages = client_min_messages_old
+        has_support
+      end
+
+      # Returns the configured supported identifier length supported by PostgreSQL,
+      # or report the default of 63 on PostgreSQL 7.x.
-      def table_alias_length
-63
+@table_alias_length ||= (postgresql_version >= 80000 ? query('SHOW max_identifier_length')[0][0].to_i : 63)
-      end
-
-      # QUOTING ==================================================
-
-
+
+
-        if value.kind_of?(String) && column && column.type == :binary
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else
-          super
-        end
-      end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        %("#{name}")
-      end
-
-
-
+
+
+
-        if value.acts_like?(:time) && value.respond_to?(:usec)
-          "#{super}.#{sprintf("%06d", value.usec)}"
-        else
@@ -140 +367 @@
-
-      # DATABASE STATEMENTS ======================================
-
-
+
+
-        execute(sql, name)
-        table = sql.split(" ", 4)[2]
-        id_value || last_insert_id(table, sequence_name || default_sequence_name(table, pk))
-      end
-
+      # Queries the database and returns the results in an Array or nil otherwise.
-      def query(sql, name = nil) #:nodoc:
-        log(sql, name) do
-          if @async
@@ -156 +385 @@
-        end
-      end
-
-
+
+
+
-        log(sql, name) do
-          if @async
-            @connection.async_exec(sql)
@@ -166 +397 @@
-        end
-      end
-
-
+
+
-        execute(sql, name).cmdtuples
-      end
-
-
+
+
-        execute "BEGIN"
-      end
-
-
+
+
-        execute "COMMIT"
-      end
-
-
+
+
-        execute "ROLLBACK"
-      end
-
-      # SCHEMA STATEMENTS ========================================
-
- the list of all tables in the schema search path
- #:nodoc:
+s the list of all tables in the schema search path or a specified schema
+
-        schemas = schema_search_path.split(/,/).map { |p| quote(p) }.join(',')
-        query(<<-SQL, name).map { |row| row[0] }
-          SELECT tablename
@@ -194 +429 @@
-        SQL
-      end
-
-
+
+
-        result = query(<<-SQL, name)
-          SELECT i.relname, d.indisunique, a.attname
-            FROM pg_class t, pg_class i, pg_index d, pg_attribute a
@@ -227 +463 @@
-        indexes
-      end
-
-
-
-
-
+
+
+
+
+
-        end
-      end
-
-
-
-
-
+
+
+
+
+
+
-        if schema_csv
-          execute "SET search_path TO #{schema_csv}"
-nil
+schema_csv
-        end
-      end
-
-
+
+
-        @schema_search_path ||= query('SHOW search_path')[0][0]
-      end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        default_pk, default_seq = pk_and_sequence_for(table_name)
-        default_seq || "#{table_name}_#{pk || default_pk || 'id'}_seq"
-      end
-
-sequence to the max value of the table's pk if present
-
+the sequence of a table's primary key to the maximum value
+ #:nodoc:
-        unless pk and sequence
-          default_pk, default_sequence = pk_and_sequence_for(table)
-          pk ||= default_pk
@@ -271 +522 @@
-        end
-      end
-
-Find a table's primary key and
-
+Returns a table's primary key and belonging
+ #:nodoc:
-        # First try looking for a sequence with a dependency on the
-        # given table's primary key.
-        result = query(<<-end_sql, 'PK and serial sequence')[0]
-name.nspname, 
+
-          FROM pg_class      seq,
-               pg_attribute  attr,
-               pg_depend     dep,
-               pg_namespace  name,
-               pg_constraint cons
-          WHERE seq.oid           = dep.objid
-            AND seq.relnamespace  = name.oid
-            AND seq.relkind       = 'S'
-            AND attr.attrelid     = dep.refobjid
-            AND attr.attnum       = dep.refobjsubid
@@ -297 +547 @@
-          # If that fails, try parsing the primary key's default value.
-          # Support the 7.x and 8.0 nextval('foo'::text) as well as
-          # the 8.1+ nextval('foo'::regclass).
-          # TODO: assumes sequence is in same schema as table.
-          result = query(<<-end_sql, 'PK and custom sequence')[0]
-name.nspname, 
+
-            FROM pg_class       t
-            JOIN pg_namespace   name ON (t.relnamespace = name.oid)
-            JOIN pg_attribute   attr ON (t.oid = attrelid)
-            JOIN pg_attrdef     def  ON (adrelid = attrelid AND adnum = attnum)
-            JOIN pg_constraint  cons ON (conrelid = adrelid AND adnum = conkey[1])
@@ -310 +558 @@
-              AND def.adsrc ~* 'nextval'
-          end_sql
-        end
-
-
+
-        [result.first, result.last]
-      rescue
-        nil
-      end
-
+      # Renames a table.
-      def rename_table(name, new_name)
-        execute "ALTER TABLE #{name} RENAME TO #{new_name}"
-      end
-
+      # Adds a column to a table.
-      def add_column(table_name, column_name, type, options = {})
-        default = options[:default]
-        notnull = options[:null] == false
@@ -343 +592 @@
-        end
-      end
-
-
+
+
-        begin
-          execute "ALTER TABLE #{table_name} ALTER COLUMN #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-        rescue ActiveRecord::StatementInvalid
-G7, so we
+ostgreSQL 7.x, so we have to
-          begin_db_transaction
-          tmp_column_name = "#{column_name}_ar_tmp"
-          add_column(table_name, tmp_column_name, type, options)
@@ -362 +612 @@
-        end
-      end
-
-
+
+
-        execute "ALTER TABLE #{table_name} ALTER COLUMN #{quote_column_name(column_name)} SET DEFAULT #{quote(default)}"
-      end
-
-
+
+
-        execute "ALTER TABLE #{table_name} RENAME COLUMN #{quote_column_name(column_name)} TO #{quote_column_name(new_column_name)}"
-      end
-
-
+
+
-        execute "DROP INDEX #{index_name(table_name, options)}"
-      end
-
-
+
+
-        return super unless type.to_s == 'integer'
-
-        if limit.nil? || limit == 4
@@ -386 +640 @@
-        end
-      end
-      
-
+Returns a 
-      #
-      # PostgreSQL requires the ORDER BY columns in the select list for distinct queries, and
-      # requires that the ORDER BY include the distinct column.
-      #
-      #   distinct("posts.id", "posts.created_at desc")
-
+ #:nodoc:
-        return "DISTINCT #{columns}" if order_by.blank?
-
-c
-asc/desc
+C
+ASC/DESC
-        order_columns = order_by.split(',').collect { |s| s.split.first }
-        order_columns.delete_if &:blank?
-        order_columns = order_columns.zip((0...order_columns.size).to_a).map { |s,i| "#{s} AS alias_#{i}" }
-
-r
-
+R
+.
-        sql = "DISTINCT ON (#{columns}) #{columns}, "
-        sql << order_columns * ', '
-      end
-      
-
+Returns a 
-      # 
-      # PostgreSQL does not allow arbitrary ordering when using DISTINCT ON, so we work around this
-      # by wrapping the sql as a sub-select and ordering in that query.
-
+ #:nodoc:
-        return sql if options[:order].blank?
-