activerecord-jdbc-adapter 1.3.7 → 1.3.8

data/lib/arjdbc/postgresql/column.rb

@@ -24,8 +24,8 @@ module ArJdbc
             require 'pg_array_parser'
             include PgArrayParser
           rescue LoadError
-            require 'arjdbc/postgresql/array_parser'
-            include ArrayParser
+            require 'arjdbc/postgresql/base/array_parser'
+            include ActiveRecord::ConnectionAdapters::PostgreSQL::ArrayParser
           end if AR4_COMPAT
 
           include Cast
@@ -33,8 +33,21 @@ module ArJdbc
         end
       end
 
+      # @private
+      def oid_type
+        @oid_type ||= begin
+          raise "oid not defined" unless oid = (@oid ||= nil)
+          @adapter.get_oid_type(oid.to_i, @fmod.to_i, name)
+        end
+      end if AR4_COMPAT
+
+      def accessor; oid_type.accessor end if AR4_COMPAT
+
       ( attr_accessor :array; def array?; array; end ) if AR4_COMPAT
 
+      def number?; !array && super end if AR4_COMPAT
+      def text?; !array && super end if AR4_COMPAT
+
       # Extracts the value from a PostgreSQL column default definition.
       #
       # @override JdbcColumn#default_value
@@ -354,7 +367,7 @@ module ArJdbc
           when  'infinity' then  1.0 / 0.0
           when '-infinity' then -1.0 / 0.0
           when / BC$/
-            super("-" + string.sub(/ BC$/, ""))
+            super("-#{string.sub(/ BC$/, "")}")
           else
             super
           end
@@ -376,9 +389,11 @@ module ArJdbc
           end
         end if AR4_COMPAT
 
-        def hstore_to_string(object)
+        def hstore_to_string(object, array_member = false)
           if Hash === object
-            object.map { |k,v| "#{escape_hstore(k)}=>#{escape_hstore(v)}" }.join(',')
+            string = object.map { |k, v| "#{escape_hstore(k)}=>#{escape_hstore(v)}" }.join(',')
+            string = escape_hstore(string) if array_member
+            string
           else
             object
           end
@@ -388,10 +403,10 @@ module ArJdbc
           if string.nil?
             nil
           elsif String === string
-            Hash[string.scan(HstorePair).map { |k,v|
-              v = v.upcase == 'NULL' ? nil : v.gsub(/^"(.*)"$/,'\1').gsub(/\\(.)/, '\1')
-              k = k.gsub(/^"(.*)"$/,'\1').gsub(/\\(.)/, '\1')
-              [k,v]
+            Hash[string.scan(HstorePair).map { |k, v|
+              v = v.upcase == 'NULL' ? nil : v.gsub(/\A"(.*)"\Z/m,'\1').gsub(/\\(.)/, '\1')
+              k = k.gsub(/\A"(.*)"\Z/m,'\1').gsub(/\\(.)/, '\1')
+              [k, v]
             }]
           else
             string
@@ -406,7 +421,7 @@ module ArJdbc
           end
         end
 
-        def array_to_string(value, column, adapter, should_be_quoted = false)
+        def array_to_string(value, column, adapter)
           casted_values = value.map do |val|
             if String === val
               if val == "NULL"
@@ -439,7 +454,11 @@ module ArJdbc
           if string.nil?
             nil
           elsif String === string
-            IPAddr.new(string)
+            begin
+              IPAddr.new(string)
+            rescue ArgumentError
+              nil
+            end
           else
             string
           end
@@ -454,9 +473,9 @@ module ArJdbc
         end
 
         # @note Only used for default values - we get a "parsed" array from JDBC.
-        def string_to_array(string, column)
+        def string_to_array(string, column_or_oid)
           return string unless String === string
-          parse_pg_array(string).map { |val| column.type_cast(val, column.type) }
+          parse_pg_array(string).map { |val| type_cast_array(column_or_oid, val) }
         end
 
         private
@@ -480,12 +499,28 @@ module ArJdbc
           end
         end
 
+        ARRAY_ESCAPE = "\\" * 2 * 2 # escape the backslash twice for PG arrays
+
         def quote_and_escape(value)
           case value
-          when "NULL"
+          when "NULL", Numeric
             value
           else
-            "\"#{value.gsub(/(["\\])/, '\\\\\1')}\""
+            value = value.gsub(/\\/, ARRAY_ESCAPE)
+            value.gsub!(/"/,"\\\"")
+            "\"#{value}\""
+          end
+        end
+
+        def type_cast_array(oid, value)
+          if ::Array === value
+            value.map { |item| type_cast_array(oid, item) }
+          else
+            if oid.is_a?(Column)
+              oid.type_cast value, oid.type # column.type
+            else
+              oid.type_cast value
+            end
           end
         end
 

data/lib/arjdbc/postgresql/oid_types.rb

@@ -0,0 +1,126 @@
+require 'arjdbc/postgresql/base/oid' # 'active_record/connection_adapters/postgresql/oid'
+require 'thread'
+
+module ArJdbc
+  module PostgreSQL
+    module OIDTypes
+
+      OID = ActiveRecord::ConnectionAdapters::PostgreSQL::OID
+
+      def get_oid_type(oid, fmod, column_name)
+        type_map.fetch(oid, fmod) {
+          warn "unknown OID #{oid}: failed to recognize type of '#{column_name}'. It will be treated as String."
+          type_map[oid] = OID::Identity.new
+        }
+      end
+
+      # @override
+      def enable_extension(name)
+        result = super(name)
+        @extensions = nil
+        reload_type_map
+        result
+      end
+
+      # @override
+      def disable_extension(name)
+        result = super(name)
+        @extensions = nil
+        reload_type_map
+        result
+      end
+
+      # @override
+      def extensions
+        @extensions ||= super
+      end
+
+      private
+
+      @@type_map_cache = {}
+      @@type_map_cache_lock = Mutex.new
+
+      # @private
+      class OID::TypeMap
+        def dup
+          dup = super # make sure @mapping is not shared
+          dup.instance_variable_set(:@mapping, @mapping.dup)
+          dup
+        end
+      end
+
+      def type_map
+        # NOTE: our type_map is lazy since it's only used for `adapter.accessor`
+        @type_map ||= begin
+          if type_map = @@type_map_cache[ type_cache_key ]
+            type_map.dup
+          else
+            type_map = OID::TypeMap.new
+            initialize_type_map(type_map)
+            cache_type_map(type_map)
+            type_map
+          end
+        end
+      end
+
+      def reload_type_map
+        if ( @type_map ||= nil )
+          @type_map.clear
+          initialize_type_map(@type_map)
+        end
+      end
+
+      def cache_type_map(type_map)
+        @@type_map_cache_lock.synchronize do
+          @@type_map_cache[ type_cache_key ] = type_map
+        end
+      end
+
+      def type_cache_key
+        config.hash + ( 7 * extensions.hash )
+      end
+
+      def add_oid(row, records_by_oid, type_map)
+        return type_map if type_map.key? row['type_elem'].to_i
+
+        if OID.registered_type? typname = row['typname']
+          # this composite type is explicitly registered
+          vector = OID::NAMES[ typname ]
+        else
+          # use the default for composite types
+          unless type_map.key? typelem = row['typelem'].to_i
+            add_oid records_by_oid[ row['typelem'] ], records_by_oid, type_map
+          end
+
+          vector = OID::Vector.new row['typdelim'], type_map[typelem]
+        end
+
+        type_map[ row['oid'].to_i ] = vector
+        type_map
+      end
+
+      def initialize_type_map(type_map)
+        result = execute('SELECT oid, typname, typelem, typdelim, typinput FROM pg_type', 'SCHEMA')
+        leaves, nodes = result.partition { |row| row['typelem'].to_s == '0' }
+        # populate the leaf nodes
+        leaves.find_all { |row| OID.registered_type? row['typname'] }.each do |row|
+          type_map[ row['oid'].to_i ] = OID::NAMES[ row['typname'] ]
+        end
+
+        records_by_oid = result.group_by { |row| row['oid'] }
+
+        arrays, nodes = nodes.partition { |row| row['typinput'] == 'array_in' }
+
+        # populate composite types
+        nodes.each { |row| add_oid row, records_by_oid, type_map }
+
+        # populate array types
+        arrays.find_all { |row| type_map.key? row['typelem'].to_i }.each do |row|
+          array = OID::Array.new  type_map[ row['typelem'].to_i ]
+          type_map[ row['oid'].to_i ] = array
+        end
+      end
+
+    end
+  end
+end

data/lib/arjdbc/tasks/h2_database_tasks.rb

@@ -20,8 +20,10 @@ module ArJdbc
       # @override
       def delete_database_files(config)
         return unless db_base = database_base_name(config)
-        db_files = [ "#{db_base}.h2.db", "#{db_base}.lock.db", "#{db_base}.trace.db" ]
-        db_files.each { |file| File.delete(file) if File.exist?(file) }
+        for suffix in [ '.h2,db', '.mv.db', '.lock.db', '.trace.db' ]
+          db_file = "#{db_base}#{suffix}"
+          File.delete(db_file) if File.exist?(db_file)
+        end
       end
 
     end

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "1.3.7"
+  VERSION = "1.3.8"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

data/rakelib/02-test.rake

@@ -47,16 +47,6 @@ task 'test_appraisal_hint' do
   end
 end
 
-desc "Run unit tests (not connecting to a DB)."
-Rake::TestTask.new(:test_unit) do |test_task|
-  test_task.test_files = FileList["test/unit*_test.rb"] + FileList["test/unit/*_test.rb"]
-  test_task.libs << 'lib' if defined?(JRUBY_VERSION)
-  test_task.libs << 'test'
-  test_task.verbose = true if $VERBOSE
-  set_test_task_compat_version test_task
-end
-task :test_units => :test_unit # alias
-
 Rake::TestTask.class_eval { attr_reader :test_files }
 
 def test_task_for(adapter, options = {})
@@ -95,12 +85,14 @@ test_task_for :H2, :desc => 'Run tests against H2 database engine'
 test_task_for :HSQLDB, :desc => 'Run tests against HyperSQL (Java) database'
 test_task_for :MSSQL, :driver => :jtds, :database_name => 'MS-SQL (SQLServer)'
 test_task_for :MySQL, :prereqs => 'db:mysql'
-test_task_for :PostgreSQL, :prereqs => 'db:postgresql', :driver => 'postgres'
+test_task_for :PostgreSQL, :driver => 'postgres', :prereqs => 'db:postgresql'
 task :test_postgres => :test_postgresql # alias
 test_task_for :SQLite3
 task :test_sqlite => :test_sqlite3 # alias
 test_task_for :Firebird
 
+test_task_for :MariaDB, :prereqs => 'db:mysql', :files => FileList["test/db/mysql/*_test.rb"]
+
 # ensure driver for these DBs is on your class-path
 [ :Oracle, :DB2, :Informix, :CacheDB ].each do |adapter|
   test_task_for adapter, :desc => "Run tests against #{adapter} (ensure driver is on class-path)"
@@ -136,22 +128,3 @@ end
 #task :test_sybase_jtds => :test_sybase # alias
 #test_task_for :Sybase, :name => 'sybase_jconnect',
 #  :desc => "Run tests against Sybase (ensure jConnect driver is on class-path)"
-
-Rake::TraceOutput.module_eval do
-
-  # NOTE: avoid TypeError: String can't be coerced into Fixnum
-  # due this method getting some strings == [ 1 ] argument ...
-  def trace_on(out, *strings)
-    sep = $\ || "\n"
-    if strings.empty?
-      output = sep
-    else
-      output = strings.map { |s|
-        next if s.nil?; s = s.to_s
-        s =~ /#{sep}$/ ? s : s + sep
-      }.join
-    end
-    out.print(output)
-  end
-
-end

data/src/java/arjdbc/derby/DerbyModule.java

@@ -171,14 +171,6 @@ public class DerbyModule {
         return RubyString.newString(context.getRuntime(), BYTES_0);
     }
 
-    private static RubyString quoteBoolean(final Ruby runtime, final IRubyObject value) {
-        return value.isTrue() ? runtime.newString(BYTES_1) : runtime.newString(BYTES_0);
-    }
-
-    private static boolean isMultibyteChars(final Ruby runtime, final IRubyObject value) {
-        return getMultibyteChars(runtime).isInstance(value);
-    }
-
     private static RubyModule getMultibyteChars(final Ruby runtime) {
         return (RubyModule) ((RubyModule) runtime.getModule("ActiveSupport").
                 getConstant("Multibyte")).getConstantAt("Chars");

data/src/java/arjdbc/derby/DerbyRubyJdbcConnection.java

@@ -46,6 +46,7 @@ import org.jruby.util.ByteList;
  * @author kares
  */
 public class DerbyRubyJdbcConnection extends RubyJdbcConnection {
+    private static final long serialVersionUID = 4809475910953623325L;
 
     protected DerbyRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);

data/src/java/arjdbc/h2/H2RubyJdbcConnection.java

@@ -37,6 +37,8 @@ import org.jruby.runtime.builtin.IRubyObject;
  * @author nicksieger
  */
 public class H2RubyJdbcConnection extends RubyJdbcConnection {
+    private static final long serialVersionUID = -2652911264521657428L;
+    
     protected H2RubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -1300,7 +1300,7 @@ public class RubyJdbcConnection extends RubyObject {
         final boolean binary = // column.type == :binary
             column.callMethod(context, "type").toString() == (Object) "binary";
 
-        final RubyClass recordClass = record.getMetaClass(); // record.class
+        final IRubyObject recordClass = record.callMethod(context, "class");
         final IRubyObject adapter = recordClass.callMethod(context, "connection");
 
         IRubyObject columnName = column.callMethod(context, "name");
@@ -1314,7 +1314,7 @@ public class RubyJdbcConnection extends RubyObject {
 
         final IRubyObject id = record.callMethod(context, "id"); // record.id
 
-        int count = updateLobValue(context,
+        final int count = updateLobValue(context,
             tableName.toString(), columnName.toString(), column,
             idKey.toString(), id, idColumn, value, binary
         );
@@ -2860,12 +2860,12 @@ public class RubyJdbcConnection extends RubyObject {
         final Ruby runtime = context.getRuntime();
         final IRubyObject jdbcColumn = getJdbcColumnClass(context);
 
-        final List<String> primarykeyNames = new ArrayList<String>();
+        final List<String> primaryKeyNames = new ArrayList<String>(4);
         while ( primaryKeys.next() ) {
-            primarykeyNames.add( primaryKeys.getString(COLUMN_NAME) );
+            primaryKeyNames.add( primaryKeys.getString(COLUMN_NAME) );
         }
 
-        final List<IRubyObject> columns = new ArrayList<IRubyObject>();
+        final RubyArray columns = runtime.newArray();
         final IRubyObject config = getInstanceVariable("@config");
         while ( results.next() ) {
             final String colName = results.getString(COLUMN_NAME);
@@ -2877,13 +2877,13 @@ public class RubyJdbcConnection extends RubyObject {
                     RubyString.newUnicodeString( runtime, typeFromResultSet(results) ),
                     runtime.newBoolean( ! results.getString(IS_NULLABLE).trim().equals("NO") )
                 });
-            columns.add(column);
+            columns.append(column);
 
-            if ( primarykeyNames.contains(colName) ) {
+            if ( primaryKeyNames.contains(colName) ) {
                 column.callMethod(context, "primary=", runtime.getTrue());
             }
         }
-        return runtime.newArray(columns);
+        return columns;
     }
 
     protected IRubyObject mapGeneratedKeys(

data/src/java/arjdbc/mssql/MSSQLModule.java

@@ -25,47 +25,78 @@ package arjdbc.mssql;
 
 import static arjdbc.util.QuotingUtils.BYTES_0;
 import static arjdbc.util.QuotingUtils.BYTES_1;
+import static arjdbc.util.QuotingUtils.quoteCharWith;
 import static arjdbc.util.QuotingUtils.quoteSingleQuotesWithFallback;
 
 import org.jruby.RubyModule;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
 
 /**
  * ArJdbc::MSSQL
- * 
+ *
  * @author kares
  */
 public class MSSQLModule {
-    
+
     public static RubyModule load(final RubyModule arJdbc) {
         RubyModule mssql = arJdbc.defineModuleUnder("MSSQL");
         mssql.defineAnnotatedMethods( MSSQLModule.class );
         return mssql;
     }
-    
-    @JRubyMethod(name = "quote_string", required = 1, frame = false)
-    public static IRubyObject quote_string(
-            final ThreadContext context, 
-            final IRubyObject self, 
-            final IRubyObject string) {
+
+    @JRubyMethod(name = "quote_string", required = 1)
+    public static IRubyObject quote_string(final ThreadContext context,
+        final IRubyObject self, final IRubyObject string) {
         return quoteSingleQuotesWithFallback(context, string);
     }
-    
-    @JRubyMethod(name = "quoted_true", required = 0, frame = false)
-    public static IRubyObject quoted_true(
-            final ThreadContext context, 
-            final IRubyObject self) {
+
+    @JRubyMethod(name = "quoted_true", required = 0)
+    public static IRubyObject quoted_true(final ThreadContext context,
+        final IRubyObject self) {
         return RubyString.newString(context.getRuntime(), BYTES_1);
     }
-    
-    @JRubyMethod(name = "quoted_false", required = 0, frame = false)
-    public static IRubyObject quoted_false(
-            final ThreadContext context, 
-            final IRubyObject self) {
+
+    @JRubyMethod(name = "quoted_false", required = 0)
+    public static IRubyObject quoted_false(final ThreadContext context,
+        final IRubyObject self) {
         return RubyString.newString(context.getRuntime(), BYTES_0);
     }
-    
+
+    // part =~ /^\[.*\]$/ ? part : "[#{part.gsub(']', ']]')}]"
+    @SuppressWarnings("deprecation")
+    @JRubyMethod(required = 1, visibility = Visibility.PRIVATE)
+    public static IRubyObject quote_name_part(final ThreadContext context,
+        final IRubyObject self, final IRubyObject part) {
+
+        final RubyString partString = ((RubyString) part);
+        final ByteList str = partString.getByteList();
+        if ( str.charAt(0) == '[' && str.charAt(str.length() - 1) == ']' ) {
+            return part; // part =~ /^\[.*\]$/ ? part
+        }
+        final RubyString quotedString = // part.gsub(']', ']]')
+            quoteCharWith(context, partString, ']', ']', 1, 4 + 1);
+        if ( quotedString == partString ) {
+            final int realSize = str.getRealSize();
+            final ByteList quoted = new ByteList(
+                new byte[realSize + 2], partString.getEncoding(), false
+            );
+            quoted.begin = 0; quoted.realSize = 0;
+            quoted.append('[');
+            quoted.append(str.unsafeBytes(), str.getBegin(), realSize);
+            quoted.append(']');
+            return context.getRuntime().newString(quoted);
+        }
+        // we got a new string with a reserve of 1 byte front and back :
+        final ByteList quoted = quotedString.getByteList();
+        quoted.begin = 0; // setBegin invalidates
+        quoted.bytes[0] = '['; quoted.realSize++;
+        quoted.append(']');
+        return quotedString;
+    }
+
 }