activerecord-jdbc-adapter 1.3.7 → 1.3.8

data/src/java/arjdbc/util/QuotingUtils.java

@@ -23,7 +23,6 @@
  */
 package arjdbc.util;
 
-import org.jruby.Ruby;
 import org.jruby.RubyString;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -49,6 +48,15 @@ public abstract class QuotingUtils {
             final ThreadContext context,
             final RubyString string,
             final char value, final char quote) {
+        return quoteCharWith(context, string, value, quote, 0, 8);
+    }
+
+    @SuppressWarnings("deprecation")
+    public static RubyString quoteCharWith(
+            final ThreadContext context,
+            final RubyString string,
+            final char value, final char quote,
+            final int newOffset, final int newSizeDiff) {
 
         final ByteList stringBytes = string.getByteList();
         final byte[] bytes = stringBytes.unsafeBytes();
@@ -60,11 +68,11 @@ public abstract class QuotingUtils {
             if ( bytes[i] == value ) {
                 if ( quotedBytes == null ) {
                     quotedBytes = new ByteList(
-                        new byte[realSize + 8],
-                        stringBytes.getEncoding()
+                        new byte[realSize + newOffset + newSizeDiff],
+                        stringBytes.getEncoding(), false
                     );
-                    quotedBytes.setBegin(0);
-                    quotedBytes.setRealSize(0);
+                    quotedBytes.begin = newOffset;
+                    quotedBytes.realSize = 0;
                 }
                 quotedBytes.append(bytes, appendFrom, i - appendFrom);
                 quotedBytes.append(quote).append(value); // e.g. "'" => "''"
@@ -76,8 +84,7 @@ public abstract class QuotingUtils {
         }
         else return string; // nothing changed, can return original
 
-        final Ruby runtime = context.getRuntime();
-        return runtime.newString(quotedBytes);
+        return context.getRuntime().newString(quotedBytes);
     }
 
     public static final ByteList BYTES_SINGLE_Q = new ByteList(new byte[] { '\'' }, false);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbc-adapter
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini, Karol Bucek and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -60,6 +60,7 @@ files:
 - lib/active_record/connection_adapters/informix_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter.rb
 - lib/active_record/connection_adapters/jndi_adapter.rb
+- lib/active_record/connection_adapters/mariadb_adapter.rb
 - lib/active_record/connection_adapters/mssql_adapter.rb
 - lib/active_record/connection_adapters/mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql_adapter.rb
@@ -72,6 +73,7 @@ files:
 - lib/arel/visitors/db2.rb
 - lib/arel/visitors/derby.rb
 - lib/arel/visitors/firebird.rb
+- lib/arel/visitors/h2.rb
 - lib/arel/visitors/hsqldb.rb
 - lib/arel/visitors/sql_server.rb
 - lib/arjdbc.rb
@@ -142,10 +144,12 @@ files:
 - lib/arjdbc/oracle/connection_methods.rb
 - lib/arjdbc/postgresql.rb
 - lib/arjdbc/postgresql/adapter.rb
-- lib/arjdbc/postgresql/array_parser.rb
+- lib/arjdbc/postgresql/base/array_parser.rb
+- lib/arjdbc/postgresql/base/oid.rb
 - lib/arjdbc/postgresql/column.rb
 - lib/arjdbc/postgresql/connection_methods.rb
 - lib/arjdbc/postgresql/explain_support.rb
+- lib/arjdbc/postgresql/oid_types.rb
 - lib/arjdbc/postgresql/schema_creation.rb
 - lib/arjdbc/railtie.rb
 - lib/arjdbc/sqlite3.rb
@@ -212,6 +216,7 @@ files:
 - src/java/arjdbc/sqlite3/SQLite3Module.java
 - src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java
 - src/java/arjdbc/sqlite3/Sqlite3RubyJdbcConnection.java
+- src/java/arjdbc/util/CallResultSet.java
 - src/java/arjdbc/util/QuotingUtils.java
 homepage: https://github.com/jruby/activerecord-jdbc-adapter
 licenses:

data/lib/arjdbc/postgresql/array_parser.rb

@@ -1,89 +0,0 @@
-module ArJdbc
-  module PostgreSQL
-    module ArrayParser
-
-      def parse_pg_array(string)
-        parse_data(string, 0)
-      end
-
-      private
-
-      def parse_data(string, index)
-        local_index = index
-        array = []
-        while(local_index < string.length)
-          case string[local_index]
-          when '{'
-            local_index,array = parse_array_contents(array, string, local_index + 1)
-          when '}'
-            return array
-          end
-          local_index += 1
-        end
-
-        array
-      end
-
-      def parse_array_contents(array, string, index)
-        is_escaping = false
-        is_quoted = false
-        was_quoted = false
-        current_item = ''
-
-        local_index = index
-        while local_index
-          token = string[local_index]
-          if is_escaping
-            current_item << token
-            is_escaping = false
-          else
-            if is_quoted
-              case token
-              when '"'
-                is_quoted = false
-                was_quoted = true
-              when "\\"
-                is_escaping = true
-              else
-                current_item << token
-              end
-            else
-              case token
-              when "\\"
-                is_escaping = true
-              when ','
-                add_item_to_array(array, current_item, was_quoted)
-                current_item = ''
-                was_quoted = false
-              when '"'
-                is_quoted = true
-              when '{'
-                internal_items = []
-                local_index,internal_items = parse_array_contents(internal_items, string, local_index + 1)
-                array.push(internal_items)
-              when '}'
-                add_item_to_array(array, current_item, was_quoted)
-                return local_index,array
-              else
-                current_item << token
-              end
-            end
-          end
-
-          local_index += 1
-        end
-        return local_index,array
-      end
-
-      def add_item_to_array(array, current_item, quoted)
-        if current_item.length == 0
-        elsif !quoted && current_item == 'NULL'
-          array.push nil
-        else
-          array.push current_item
-        end
-      end
-
-    end
-  end
-end