Ticket #8049: improve_postgresql_adapter.diff

activerecord/test/migration_test.rb

@@ -194 +194 @@
-      Person.connection.create_table :testings do |t|
-        t.column :foo, :string
-      end
-
-     
+
+
-      Person.connection.enable_identity_insert("testings", true) if current_adapter?(:SybaseAdapter)
-      Person.connection.execute "insert into testings (#{con.quote_column_name('id')}, #{con.quote_column_name('foo')}) values (1, 'hello')"
-      Person.connection.enable_identity_insert("testings", false) if current_adapter?(:SybaseAdapter)
@@ -278 +278 @@
-
-      # Test for 30 significent digits (beyond the 16 of float), 10 of them
-      # after the decimal place.
-
+
-      assert_equal BigDecimal.new("0012345678901234567890.0123456789"), bob.wealth
-
-      assert_equal true, bob.male?
@@ -405 +405 @@
-          t.column :url, :string
-        end
-        ActiveRecord::Base.connection.add_index :octopuses, :url
-
+
-        ActiveRecord::Base.connection.rename_table :octopuses, :octopi
-
-        # Using explicit id in insert for compatibility across all databases
@@ -436 +436 @@
-      old_columns = Topic.connection.columns(Topic.table_name, "#{name} Columns")
-      assert old_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
-      assert_nothing_raised { Topic.connection.change_column :topics, :approved, :boolean, :default => false }
-     
+
-      assert_nil new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == true }
-      assert new_columns.find { |c| c.name == 'approved' and c.type == :boolean and c.default == false }
-      assert_nothing_raised { Topic.connection.change_column :topics, :approved, :boolean, :default => true }
-    end
-
+
-    def test_change_column_with_nil_default
-      Person.connection.add_column "people", "contributor", :boolean, :default => true
-      Person.reset_column_information
-      assert Person.new.contributor?
-
+
-      assert_nothing_raised { Person.connection.change_column "people", "contributor", :boolean, :default => nil }
-      Person.reset_column_information
-      assert !Person.new.contributor?
@@ -466 +466 @@
-    ensure
-      Person.connection.remove_column("people", "administrator") rescue nil
-    end
-
+
-    def test_change_column_default
-      Person.connection.change_column_default "people", "first_name", "Tester"
-      Person.reset_column_information
@@ -731 +731 @@
-    def test_migrator_with_missing_version_numbers
-      ActiveRecord::Migrator.migrate(File.dirname(__FILE__) + '/fixtures/migrations_with_missing_versions/', 500)
-      assert !Person.column_methods_hash.include?(:middle_name)
-   
-
-                       
-                       
-                   
-                       
+  
+
+      
+      
+
+      
-    end
-
+
-    def test_create_table_with_custom_sequence_name
-      return unless current_adapter? :OracleAdapter
-
@@ -778 +778 @@
-
-  end
-end
-

activerecord/test/datatype_test_postgresql.rb

@@ -1 +1 @@
-require 'abstract_unit'
-
-Datatype
+Array
-end
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  self.use_transactional_fixtures = false
-
-TABLE_NAME = 'postgresql_datatype
-
+ARRAY_TABLE_NAME = 'postgresql_array
+ARRAY_
-    'id SERIAL PRIMARY KEY',
-    'commission_by_quarter INTEGER[]',
-    'nicknames TEXT[]'
-  ]
-
+  MONEY_TABLE_NAME = 'postgresql_moneys'
+  MONEY_COLUMNS = [
+    'id SERIAL PRIMARY KEY',
+    'wealth MONEY'
+  ]
+
+  NUMBER_TABLE_NAME = 'postgresql_numbers'
+  NUMBER_COLUMNS = [
+    'id SERIAL PRIMARY KEY',  
+    'single REAL',
+    'double DOUBLE PRECISION'
+  ]
+
+  TIME_TABLE_NAME = 'postgresql_times'
+  TIME_COLUMNS = [
+    'id SERIAL PRIMARY KEY',
+    'time_interval INTERVAL'
+  ]
+
+  NETWORK_ADDRESS_TABLE_NAME = 'postgresql_network_addresses'
+  NETWORK_ADDRESS_COLUMNS = [
+    'id SERIAL PRIMARY KEY',
+    'cidr_address CIDR',
+    'inet_address INET',
+    'mac_address MACADDR'
+  ]
+
+  BIT_STRING_TABLE_NAME = 'postgresql_bit_strings'
+  BIT_STRING_COLUMNS = [
+    'id SERIAL PRIMARY KEY',
+    'bit_string BIT(8)',
+    'bit_string_varying BIT VARYING(8)'
+  ]
+
+  OID_TABLE_NAME = 'postgresql_oids'
+  OID_COLUMNS = [
+    'id SERIAL PRIMARY KEY',
+    'obj_id OID'
+  ]
+
-  def setup
-    @connection = ActiveRecord::Base.connection
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
-  def teardown
-
+
+
+
+
+
+
+
-  end
-
-  def test_data_type_of_array_types
-
-
+_array
+_array
-  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
-
-
+_array
+_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}'
-
-
-
-
+_array
+_array
+_array
+_array
-  end
-
-  def test_update_text_array
-    new_value = '{robby,robert,rob,robbie}'
-
-
-
-
+_array
+_array
+_array
+_array
-  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

@@ -232 +232 @@
-  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
@@ -254 +256 @@
-  end
-
-  def test_bind_string
-"''"
+ActiveRecord::Base.connection.quote('')
-  end
-
-  def test_bind_record
@@ -267 +269 @@
-
-  def test_string_sanitation
-    assert_not_equal "'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
-
+
+
-  end
-
-  def test_count

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

@@ -2 +2 @@
-
-module ActiveRecord
-  class Base
-
- # :nodoc:
- 'postgres'
+.
+
+('postgres')
-
-      config = config.symbolize_keys
-      host     = config[:host]
@@ -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
- ArgumentError, "No database specified. Missing argument: database."
+(ArgumentError, 'No database specified. Missing argument: database.')
-      end
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-  end
-
-
-
-
+
+
-    #
-    # Options:
-    #
@@ -48 +222 @@
-    # * <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?
+Returns if this connection is alive and ready for queries.
-      def active?
-        if @connection.respond_to?(:status)
-          @connection.status == PGconn::CONNECTION_OK
-        else
-
+
+
-          true
-        end
- is available
+ection is available.
-      rescue PGError, NoMethodError
-        false
-      end
-
- then reopen
+s and then reopens
-      def reconnect!
-        # TODO: postgres-pr doesn't have PGconn#reset.
-        if @connection.respond_to?(:reset)
-          @connection.reset
-          configure_connection
+        else
+          disconnect!
+          connect
-        end
-      end
-
+      # Closes the connection.
-      def disconnect!
-        # Both postgres and postgres-pr respond to :close
-        @connection.close rescue nil
-      end
-
-
+ #:nodoc:
-        {
-"serial primary key"
-"character varying"
-"text"
-"integer"
-"float"
-"decimal"
-"timestamp"
-"timestamp"
-"time"
-"date"
-"bytea"
-"boolean"
+'serial PRIMARY KEY'
+'character varying'
+'text'
+'integer'
+'float'
+'decimal'
+'timestamp'
+'timestamp'
+'time'
+'date'
+'bytea'
+'boolean'
-        }
-      end
-
+      # Returns true to indicate that PostgreSQL supports migrations.
-      def supports_migrations?
-        true
-      end
-
+      # Returns the configured supported identifier length supported by PostgreSQL,
+      # or report the default of 63 on PostgreSQL 7.
-      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
@@ -137 +349 @@
-        end
-      end
-
-
-      # DATABASE STATEMENTS ======================================
-
-
+
+
-        execute(sql, name)
-" "
+' '
-        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 +369 @@
-        end
-      end
-
-
+
+
+
-        log(sql, name) do
-          if @async
-            @connection.async_exec(sql)
@@ -166 +381 @@
-        end
-      end
-
-
+
+
-        execute(sql, name).cmdtuples
-      end
-
-
-
+
+
+
-      end
-
-
-
+
+
+
-      end
-
-
-
+
+
+
-      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 +413 @@
-        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
@@ -217 +437 @@
-
-        result.each do |row|
-          if current_index != row[0]
-"t"
+'t'
-            current_index = row[0]
-          end
-
@@ -227 +447 @@
-        indexes
-      end
-
-
-
-
-
+
+
+
+
+
-        end
-      end
-
-
-
-
-
+
+
+
+
+
+
-        if schema_csv
- "SET search_path TO #{schema_csv}"
-nil
+("SET search_path TO #{schema_csv}")
+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
-
-and
+the sequence of a table's primary key to the maximum value
+ #:nodoc:
+&&
-          default_pk, default_sequence = pk_and_sequence_for(table)
-          pk ||= default_pk
-          sequence ||= default_sequence
-        end
-        if pk
-          if sequence
- <<-end_sql, 'Reset sequence'
+(<<-end_sql, 'Reset sequence')
-              SELECT setval('#{sequence}', (SELECT COALESCE(MAX(#{pk})+(SELECT increment_by FROM #{sequence}), (SELECT min_value FROM #{sequence})) FROM #{table}), false)
-            end_sql
-          else
- "#{table} has primary key #{pk} with no default sequence"
+("#{table} has primary key #{pk} with no default sequence")
-          end
-        end
-      end
-