activerecord-jdbc-adapter 1.0.0.beta1-java → 1.0.0.beta2-java

data/lib/arjdbc/mssql/adapter.rb

@@ -55,6 +55,25 @@ module ::ArJdbc
       tp
     end
 
+    def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
+      # MSSQL's NVARCHAR(n | max) column supports either a number between 1 and
+      # 4000, or the word "MAX", which corresponds to 2**30-1 UCS-2 characters.
+      #
+      # It does not accept NVARCHAR(1073741823) here, so we have to change it
+      # to NVARCHAR(MAX), even though they are logically equivalent.
+      #
+      # MSSQL Server 2000 is skipped here because I don't know how it will behave.
+      #
+      # See: http://msdn.microsoft.com/en-us/library/ms186939.aspx
+      if type.to_s == 'string' and limit == 1073741823 and sqlserver_version != "2000"
+        'NVARCHAR(MAX)'
+      elsif %w( boolean date datetime ).include?(type.to_s)
+        super(type)   # cannot specify limit/precision/scale with these types
+      else
+        super
+      end
+    end
+
     module Column
       attr_accessor :identity, :is_special
 
@@ -67,9 +86,9 @@ module ::ArJdbc
         when /timestamp/i                                          then :timestamp
         when /time/i                                               then :time
         when /date/i                                               then :date
-        when /text|ntext/i                                         then :text
+        when /text|ntext|xml/i                                     then :text
         when /binary|image|varbinary/i                             then :binary
-        when /char|nchar|nvarchar|string|varchar/i                 then :string
+        when /char|nchar|nvarchar|string|varchar/i                 then (@limit == 1073741823 ? (@limit = nil; :text) : :string)
         when /bit/i                                                then :boolean
         when /uniqueidentifier/i                                   then :string
         end
@@ -94,7 +113,15 @@ module ::ArJdbc
         when :binary    then unquote value
         else value
         end
+      end
 
+      def extract_limit(sql_type)
+        case sql_type
+        when /text|ntext|xml|binary|image|varbinary|bit/
+          nil
+        else
+          super
+        end
       end
 
       def is_utf8?
@@ -108,10 +135,14 @@ module ::ArJdbc
       def cast_to_time(value)
         return value if value.is_a?(Time)
         time_array = ParseDate.parsedate(value)
+        return nil if !time_array.any?
         time_array[0] ||= 2000
         time_array[1] ||= 1
         time_array[2] ||= 1
-        Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
+        return Time.send(ActiveRecord::Base.default_timezone, *time_array) rescue nil
+
+        # Try DateTime instead - the date may be outside the time period support by Time.
+        DateTime.new(*time_array[0..5]) rescue nil
       end
 
       def cast_to_date(value)
@@ -127,8 +158,18 @@ module ::ArJdbc
             return Time.mktime(2000, 1, 1, value.hour, value.min, value.sec) rescue nil
           end
         end
+        if value.is_a?(DateTime)
+          begin
+            # Attempt to convert back to a Time, but it could fail for dates significantly in the past/future.
+            return Time.mktime(value.year, value.mon, value.day, value.hour, value.min, value.sec)
+          rescue ArgumentError
+            return value
+          end
+        end
+
         return cast_to_time(value) if value.is_a?(Date) or value.is_a?(String) rescue nil
-        value
+
+        return value.is_a?(Date) ? value : nil
       end
 
       # These methods will only allow the adapter to insert binary data with a length of 7K or less
@@ -143,7 +184,9 @@ module ::ArJdbc
       return value.quoted_id if value.respond_to?(:quoted_id)
 
       case value
-      when String, ActiveSupport::Multibyte::Chars
+      # SQL Server 2000 doesn't let you insert an integer into a NVARCHAR
+      # column, so we include Integer here.
+      when String, ActiveSupport::Multibyte::Chars, Integer
         value = value.to_s
         if column && column.type == :binary
           "'#{quote_string(ArJdbc::MsSQL::Column.string_to_binary(value))}'" # ' (for ruby-mode)
@@ -181,6 +224,10 @@ module ::ArJdbc
       quote false
     end
 
+    def adapter_name #:nodoc:
+      'MsSQL'
+    end
+
     module SqlServer2000LimitOffset
       def add_limit_offset!(sql, options)
         limit = options[:limit]
@@ -205,7 +252,13 @@ module ::ArJdbc
             #I am not sure this will cover all bases.  but all the tests pass
             new_order = "#{order}, #{table_name}.id" if order.index("#{table_name}.id").nil?
             new_order ||= order
-            new_sql = "#{select} TOP #{limit} #{rest_of_query} WHERE #{table_name}.id NOT IN (#{select} TOP #{offset} #{table_name}.id #{rest} ORDER BY #{new_order}) ORDER BY #{order} "
+
+            if (rest_of_query.match(/WHERE/).nil?)
+              new_sql = "#{select} TOP #{limit} #{rest_of_query} WHERE #{table_name}.id NOT IN (#{select} TOP #{offset} #{table_name}.id #{rest} ORDER BY #{new_order}) ORDER BY #{order} "
+            else
+              new_sql = "#{select} TOP #{limit} #{rest_of_query} AND #{table_name}.id NOT IN (#{select} TOP #{offset} #{table_name}.id #{rest} ORDER BY #{new_order}) ORDER BY #{order} "
+            end
+
             sql.replace(new_sql)
           end
         end
@@ -223,8 +276,11 @@ module ::ArJdbc
           sql.sub!(/ ORDER BY.*$/i, '')
           find_select = /\b(SELECT(?:\s+DISTINCT)?)\b(.*)/im
           whole, select, rest_of_query = find_select.match(sql).to_a
-          new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(ORDER BY #{order}) AS row_num, #{rest_of_query}"
-          new_sql << ") AS t WHERE t.row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"
+          if rest_of_query.strip!.first == '*'
+            from_table = /.*FROM\s*\b(\w*)\b/i.match(rest_of_query).to_a[1]
+          end
+          new_sql = "#{select} t.* FROM (SELECT ROW_NUMBER() OVER(ORDER BY #{order}) AS _row_num, #{from_table + '.' if from_table}#{rest_of_query}"
+          new_sql << ") AS t WHERE t._row_num BETWEEN #{start_row.to_s} AND #{end_row.to_s}"
           sql.replace(new_sql)
         end
       end
@@ -260,12 +316,14 @@ module ::ArJdbc
     end
 
     def rename_table(name, new_name)
+      clear_cached_table(name)
       execute "EXEC sp_rename '#{name}', '#{new_name}'"
     end
 
     # Adds a new column to the named table.
     # See TableDefinition#column for details of the options you can use.
     def add_column(table_name, column_name, type, options = {})
+      clear_cached_table(table_name)
       add_column_sql = "ALTER TABLE #{table_name} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
       add_column_options!(add_column_sql, options)
       # TODO: Add support to mimic date columns, using constraints to mark them as such in the database
@@ -274,15 +332,18 @@ module ::ArJdbc
     end
 
     def rename_column(table, column, new_column_name)
+      clear_cached_table(table)
       execute "EXEC sp_rename '#{table}.#{column}', '#{new_column_name}'"
     end
 
     def change_column(table_name, column_name, type, options = {}) #:nodoc:
+      clear_cached_table(table_name)
       change_column_type(table_name, column_name, type, options)
       change_column_default(table_name, column_name, options[:default]) if options_include_default?(options)
     end
 
     def change_column_type(table_name, column_name, type, options = {}) #:nodoc:
+      clear_cached_table(table_name)
       sql = "ALTER TABLE #{table_name} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
       if options.has_key?(:null)
         sql += (options[:null] ? " NULL" : " NOT NULL")
@@ -291,6 +352,7 @@ module ::ArJdbc
     end
 
     def change_column_default(table_name, column_name, default) #:nodoc:
+      clear_cached_table(table_name)
       remove_default_constraint(table_name, column_name)
       unless default.nil?
         execute "ALTER TABLE #{table_name} ADD CONSTRAINT DF_#{table_name}_#{column_name} DEFAULT #{quote(default)} FOR #{quote_column_name(column_name)}"
@@ -298,12 +360,14 @@ module ::ArJdbc
     end
 
     def remove_column(table_name, column_name)
+      clear_cached_table(table_name)
       remove_check_constraints(table_name, column_name)
       remove_default_constraint(table_name, column_name)
       execute "ALTER TABLE #{table_name} DROP COLUMN [#{column_name}]"
     end
 
     def remove_default_constraint(table_name, column_name)
+      clear_cached_table(table_name)
       defaults = select "select def.name from sysobjects def, syscolumns col, sysobjects tab where col.cdefault = def.id and col.name = '#{column_name}' and tab.name = '#{table_name}' and col.id = tab.id"
       defaults.each {|constraint|
         execute "ALTER TABLE #{table_name} DROP CONSTRAINT #{constraint["name"]}"
@@ -311,6 +375,7 @@ module ::ArJdbc
     end
 
     def remove_check_constraints(table_name, column_name)
+      clear_cached_table(table_name)
       # TODO remove all constraints in single method
       constraints = select "SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE where TABLE_NAME = '#{table_name}' and COLUMN_NAME = '#{column_name}'"
       constraints.each do |constraint|
@@ -323,17 +388,31 @@ module ::ArJdbc
     end
 
     def columns(table_name, name = nil)
+      # It's possible for table_name to be an empty string, or nil, if something attempts to issue SQL
+      # which doesn't involve a table.  IE. "SELECT 1" or "SELECT * from someFunction()".
+      return [] if table_name.blank?
+      table_name = table_name.to_s if table_name.is_a?(Symbol)
+
+      # Remove []'s from around the table name, valid in a select statement, but not when matching metadata.
+      table_name = table_name.gsub(/[\[\]]/, '')
+
       return [] if table_name =~ /^information_schema\./i
-      cc = super
-      cc.each do |col|
-        col.identity = true if col.sql_type =~ /identity/i
-        col.is_special = true if col.sql_type =~ /text|ntext|image/i
+      @table_columns = {} unless @table_columns
+      unless @table_columns[table_name]
+        @table_columns[table_name] = super
+        @table_columns[table_name].each do |col|
+          col.identity = true if col.sql_type =~ /identity/i
+          col.is_special = true if col.sql_type =~ /text|ntext|image|xml/i
+        end
       end
-      cc
+      @table_columns[table_name]
     end
 
     def _execute(sql, name = nil)
-      if sql.lstrip =~ /^insert/i
+      # Match the start of the sql to determine appropriate behaviour.  Be aware of
+      # multi-line sql which might begin with 'create stored_proc' and contain 'insert into ...' lines.
+      # Possible improvements include ignoring comment blocks prior to the first statement.
+      if sql.lstrip =~ /\Ainsert/i
         if query_requires_identity_insert?(sql)
           table_name = get_table_name(sql)
           with_identity_insert_enabled(table_name) do
@@ -342,9 +421,9 @@ module ::ArJdbc
         else
           @connection.execute_insert(sql)
         end
-      elsif sql.lstrip =~ /^(create|exec)/i
+      elsif sql.lstrip =~ /\A(create|exec)/i
         @connection.execute_update(sql)
-      elsif sql.lstrip =~ /^\(?\s*(select|show)/i
+      elsif sql.lstrip =~ /\A\(?\s*(select|show)/i
         repair_special_columns(sql)
         @connection.execute_query(sql)
       else
@@ -392,12 +471,9 @@ module ::ArJdbc
     end
 
     def identity_column(table_name)
-      @table_columns = {} unless @table_columns
-      @table_columns[table_name] = columns(table_name) if @table_columns[table_name] == nil
-      @table_columns[table_name].each do |col|
+      columns(table_name).each do |col|
         return col.name if col.identity
       end
-
       return nil
     end
 
@@ -420,9 +496,7 @@ module ::ArJdbc
 
     def get_special_columns(table_name)
       special = []
-      @table_columns ||= {}
-      @table_columns[table_name] ||= columns(table_name)
-      @table_columns[table_name].each do |col|
+      columns(table_name).each do |col|
         special << col.name if col.is_special
       end
       special
@@ -449,7 +523,11 @@ module ::ArJdbc
       # Look for an id column.  Return it, without changing case, to cover dbs with a case-sensitive collation.
       columns(table_name).each { |column| return column.name if column.name =~ /^id$/i }
       # Give up and provide something which is going to crash almost certainly
-      "id"
+      columns(table_name)[0].name
+    end
+
+    def clear_cached_table(name)
+      (@table_columns ||= {}).delete(name)
     end
   end
 end

data/lib/arjdbc/mssql/connection_methods.rb

@@ -4,9 +4,26 @@ class ActiveRecord::Base
       require "arjdbc/mssql"
       config[:host] ||= "localhost"
       config[:port] ||= 1433
-      config[:url] ||= "jdbc:jtds:sqlserver://#{config[:host]}:#{config[:port]}/#{config[:database]}"
       config[:driver] ||= "net.sourceforge.jtds.jdbc.Driver"
-      embedded_driver(config)
+
+      url = "jdbc:jtds:sqlserver://#{config[:host]}:#{config[:port]}/#{config[:database]}"
+
+      # Instance is often a preferrable alternative to port when dynamic ports are used.
+      # If instance is specified then port is essentially ignored.
+      url << ";instance=#{config[:instance]}" if config[:instance]
+
+      # This will enable windows domain-based authentication and will require the JTDS native libraries be available.
+      url << ";domain=#{config[:domain]}" if config[:domain]
+
+      # AppName is shown in sql server as additional information against the connection.
+      url << ";appname=#{config[:appname]}" if config[:appname]
+      config[:url] ||= url
+
+      if !config[:domain]
+        config[:username] ||= "sa"
+        config[:password] ||= ""
+      end
+      jdbc_connection(config)
     end
     alias_method :jdbcmssql_connection, :mssql_connection
   end

data/lib/arjdbc/mssql/tsql_helper.rb

@@ -10,6 +10,7 @@ module TSqlMethods
   end
 
   def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
+    limit = nil if %w(text binary).include? type.to_s
     return 'uniqueidentifier' if (type.to_s == 'uniqueidentifier')
     return super unless type.to_s == 'integer'
 

data/lib/arjdbc/mysql/adapter.rb

@@ -58,6 +58,8 @@ module ::ArJdbc
         when /^mediumint/i; 3
         when /^smallint/i;  2
         when /^tinyint/i;   1
+        when /^(datetime|timestamp)/
+          nil
         else
           super
         end
@@ -92,6 +94,10 @@ module ::ArJdbc
       "= BINARY"
     end
 
+    def limited_update_conditions(where_sql, quoted_table_name, quoted_primary_key)
+      where_sql
+    end
+
     # QUOTING ==================================================
 
     def quote(value, column = nil)

data/lib/arjdbc/mysql/connection_methods.rb

@@ -1,18 +1,18 @@
 # Don't need to load native mysql adapter
 $LOADED_FEATURES << "active_record/connection_adapters/mysql_adapter.rb"
+$LOADED_FEATURES << "active_record/connection_adapters/mysql2_adapter.rb"
 
 class ActiveRecord::Base
   class << self
     def mysql_connection(config)
       require "arjdbc/mysql"
       config[:port] ||= 3306
-      url_options = "zeroDateTimeBehavior=convertToNull&jdbcCompliantTruncation=false&useUnicode=true&characterEncoding="
-      url_options << (config[:encoding] || 'utf8')
-      if config[:url]
-        config[:url] = config[:url]['?'] ? "#{config[:url]}&#{url_options}" : "#{config[:url]}?#{url_options}"
-      else
-        config[:url] = "jdbc:mysql://#{config[:host]}:#{config[:port]}/#{config[:database]}?#{url_options}"
-      end
+      options = (config[:options] ||= {})
+      options['zeroDateTimeBehavior'] ||= 'convertToNull'
+      options['jdbcCompliantTruncation'] ||= 'false'
+      options['useUnicode'] ||= 'true'
+      options['characterEncoding'] = config[:encoding] || 'utf8'
+      config[:url] ||= "jdbc:mysql://#{config[:host]}:#{config[:port]}/#{config[:database]}"
       config[:driver] ||= "com.mysql.jdbc.Driver"
       config[:adapter_class] = ActiveRecord::ConnectionAdapters::MysqlAdapter
       connection = jdbc_connection(config)
@@ -20,6 +20,7 @@ class ActiveRecord::Base
       connection
     end
     alias_method :jdbcmysql_connection, :mysql_connection
+    alias_method :mysql2_connection, :mysql_connection
   end
 end
 

data/lib/arjdbc/oracle/adapter.rb

@@ -33,6 +33,10 @@ module ::ArJdbc
       [/oracle/i, lambda {|cfg,col| col.extend(::ArJdbc::Oracle::Column)}]
     end
 
+    def self.jdbc_connection_class
+      ::ActiveRecord::ConnectionAdapters::OracleJdbcConnection
+    end
+
     module Column
       def primary=(val)
         super
@@ -351,17 +355,15 @@ module ::ArJdbc
           return value.to_i.to_s
         end
         quoted = super
-        if value.acts_like?(:date) || value.acts_like?(:time)
-          quoted = "#{quoted_date(value)}"
+        if value.acts_like?(:date)
+          quoted = %Q{DATE'#{quoted_date(value)}'}
+        elsif value.acts_like?(:time)
+          quoted = %Q{TIMESTAMP'#{quoted_date(value)}'}
         end
         quoted
       end
     end
 
-    def quoted_date(value)
-      %Q{TIMESTAMP'#{super}'}
-    end
-
     def quoted_true #:nodoc:
       '1'
     end

data/lib/arjdbc/postgresql/adapter.rb

@@ -31,7 +31,7 @@ module ::ArJdbc
         return :string if field_type =~ /\[\]$/i || field_type =~ /^interval/i
         return :string if field_type =~ /^(?:point|lseg|box|"?path"?|polygon|circle)/i
         return :datetime if field_type =~ /^timestamp/i
-        return :float if field_type =~ /^real|^money/i
+        return :float if field_type =~ /^(?:real|double precision)$/i
         return :binary if field_type =~ /^bytea/i
         return :boolean if field_type =~ /^bool/i
         super
@@ -72,6 +72,8 @@ module ::ArJdbc
       tp[:string][:limit] = 255
       tp[:integer][:limit] = nil
       tp[:boolean][:limit] = nil
+      tp[:float] = { :name => "float" }
+      tp[:decimal] = { :name => "decimal" }
       tp
     end
 
@@ -124,6 +126,10 @@ module ::ArJdbc
       true
     end
 
+    def supports_count_distinct? #:nodoc:
+      false
+    end
+
     def create_savepoint
       execute("SAVEPOINT #{current_savepoint_name}")
     end
@@ -139,7 +145,7 @@ module ::ArJdbc
     # Returns the configured supported identifier length supported by PostgreSQL,
     # or report the default of 63 on PostgreSQL 7.x.
     def table_alias_length
-      @table_alias_length ||= (postgresql_version >= 80000 ? select('SHOW max_identifier_length').to_a[0][0].to_i : 63)
+      @table_alias_length ||= (postgresql_version >= 80000 ? select_one('SHOW max_identifier_length')['max_identifier_length'].to_i : 63)
     end
 
     def default_sequence_name(table_name, pk = nil)
@@ -167,12 +173,6 @@ module ::ArJdbc
       end
     end
 
-    def quote_regclass(table_name)
-      table_name.to_s.split('.').map do |part|
-        part =~ /".*"/i ? part : quote_table_name(part)
-      end.join('.')
-    end
-
     # Find a table's primary key and sequence.
     def pk_and_sequence_for(table) #:nodoc:
       # First try looking for a sequence with a dependency on the
@@ -191,7 +191,7 @@ module ::ArJdbc
             AND attr.attrelid     = cons.conrelid
             AND attr.attnum       = cons.conkey[1]
             AND cons.contype      = 'p'
-            AND dep.refobjid      = '#{table}'::regclass
+            AND dep.refobjid      = '#{quote_table_name(table)}'::regclass
         end_sql
 
       if result.nil? or result.empty?
@@ -210,7 +210,7 @@ module ::ArJdbc
             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])
-            WHERE t.oid = '#{table}'::regclass
+            WHERE t.oid = '#{quote_table_name(table)}'::regclass
               AND cons.contype = 'p'
               AND def.adsrc ~* 'nextval'
           end_sql
@@ -313,7 +313,7 @@ module ::ArJdbc
     end
 
     def drop_database(name)
-      execute "DROP DATABASE \"#{name}\""
+      execute "DROP DATABASE IF EXISTS \"#{name}\""
     end
 
     def create_schema(schema_name, pg_username)
@@ -396,13 +396,23 @@ module ::ArJdbc
       sql.replace "SELECT * FROM (#{sql}) AS id_list ORDER BY #{order}"
     end
 
-    def quote(value, column = nil)
-      return value.quoted_id if value.respond_to?(:quoted_id)
+    def quote(value, column = nil) #:nodoc:
+      return super unless column
 
-      if value.kind_of?(String) && column && column.type == :binary
+      if value.kind_of?(String) && column.type == :binary
         "'#{escape_bytea(value)}'"
-      elsif column && column.type == :primary_key
-        return value.to_s
+      elsif value.kind_of?(String) && column.sql_type == 'xml'
+        "xml '#{quote_string(value)}'"
+      elsif value.kind_of?(Numeric) && column.sql_type == 'money'
+        # Not truly string input, so doesn't require (or allow) escape string syntax.
+        "'#{value}'"
+      elsif value.kind_of?(String) && column.sql_type =~ /^bit/
+        case value
+        when /^[01]*$/
+          "B'#{value}'" # Bit-string notation
+        when /^[0-9A-F]*$/i
+          "X'#{value}'" # Hexadecimal notation
+        end
       else
         super
       end
@@ -416,6 +426,17 @@ module ::ArJdbc
       end
     end
 
+    def quote_table_name(name)
+      schema, name_part = extract_pg_identifier_from_name(name.to_s)
+
+      unless name_part
+        quote_column_name(schema)
+      else
+        table_name, name_part = extract_pg_identifier_from_name(name_part)
+        "#{quote_column_name(schema)}.#{quote_column_name(table_name)}"
+      end
+    end
+
     def quote_column_name(name)
       %("#{name}")
     end
@@ -440,7 +461,7 @@ module ::ArJdbc
     end
 
     def add_column(table_name, column_name, type, options = {})
-      execute("ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit])}")
+      execute("ALTER TABLE #{quote_table_name(table_name)} ADD #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}")
       change_column_default(table_name, column_name, options[:default]) unless options[:default].nil?
       if options[:null] == false
         execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)} = '#{options[:default]}'") if options[:default]
@@ -450,12 +471,12 @@ module ::ArJdbc
 
     def change_column(table_name, column_name, type, options = {}) #:nodoc:
       begin
-        execute "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit])}"
+        execute "ALTER TABLE #{quote_table_name(table_name)} ALTER #{quote_column_name(column_name)} TYPE #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
       rescue ActiveRecord::StatementInvalid
         # This is PG7, so we use a more arcane way of doing it.
         begin_db_transaction
         add_column(table_name, "#{column_name}_ar_tmp", type, options)
-        execute "UPDATE #{table_name} SET #{column_name}_ar_tmp = CAST(#{column_name} AS #{type_to_sql(type, options[:limit])})"
+        execute "UPDATE #{table_name} SET #{column_name}_ar_tmp = CAST(#{column_name} AS #{type_to_sql(type, options[:limit], options[:precision], options[:scale])})"
         remove_column(table_name, column_name)
         rename_column(table_name, "#{column_name}_ar_tmp", column_name)
         commit_db_transaction
@@ -497,6 +518,17 @@ module ::ArJdbc
     def tables
       @connection.tables(database_name, nil, nil, ["TABLE"])
     end
+
+    private
+    def extract_pg_identifier_from_name(name)
+      match_data = name[0,1] == '"' ? name.match(/\"([^\"]+)\"/) : name.match(/([^\.]+)/)
+
+      if match_data
+        rest = name[match_data[0].length..-1]
+        rest = rest[1..-1] if rest[0,1] == "."
+        [match_data[1], (rest.length > 0 ? rest : nil)]
+      end
+    end
   end
 end