mini_sql 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b9e4f7f96a77f3eaead87f509583b9bf604d49eec6e3caaf8a0234646eb208a
-  data.tar.gz: 94cac1f8ef8a82860686b1001761ef1b06a8be5228299427dc41d6be92d5a1c5
+  metadata.gz: 45fd7b2a7b68f3186fa88a3387188312f926128f3dcb24f9fee3e8d9b695683d
+  data.tar.gz: c9ed648c9ef6976ef774863b509c63901b1c94629561b9fce63425155248b046
 SHA512:
-  metadata.gz: 04a54bb044404c6ed17bd425b0f7779afa130002850592ad1e91a249504c0b4b46e17453a59dab0e5e816a131669079742ca1baaae013259917bfec6dedab83f
-  data.tar.gz: fd4ceaf5f7e46efb8e5b067a54304c5a5eaa5d4216ff4c405bb64688b57b7844d7106dc3568e059b912994b193e197b83f9e81bfb1d5e91611b8c3ce5b65033f
+  metadata.gz: 37d82773bbae9390c7c68852734b713a863df638510326a1022a8fe675b4aa3eb597b64ccb1adaef5067bbb808f6995e4f90c691f7b4276512708967d154f3cf
+  data.tar.gz: 81523394fe465e59ab60f8d895f1cff17c4e4006b88792dd1bc5b536b17d00b8ab2c2180f5a1e7150e53dcd4d3bac5759397f7d76870d7ce92965b3f277493b6

data/.gitignore

@@ -7,3 +7,4 @@
 /spec/reports/
 /tmp/
 Gemfile.lock
+/.idea/

data/CHANGELOG

@@ -1,3 +1,7 @@
+2019-11-04 - 0.2.2
+
+- Added adapters for JRuby postgres support thanks to @enebo
+
 2019-02-25 - 0.2.1
 
 - Handle `BigDecimal.new` deprecation by using `BigDecimal()` instead

data/Rakefile

@@ -1,10 +1,16 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+if RUBY_ENGINE == 'jruby' # Excluding sqlite3 tests
+  test_glob = "test/**/{inline_param_encoder_test.rb,postgres/*_test.rb}"
+else
+  test_glob = "test/**/*_test.rb"
+end
+
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+  t.test_files = FileList[test_glob]
 end
 
 task :default => :test

data/lib/mini_sql.rb

@@ -10,14 +10,21 @@ require_relative "mini_sql/builder"
 require_relative "mini_sql/inline_param_encoder"
 
 module MiniSql
-  module Postgres
-    autoload :Coders, "mini_sql/postgres/coders"
-    autoload :Connection, "mini_sql/postgres/connection"
-    autoload :DeserializerCache, "mini_sql/postgres/deserializer_cache"
-  end
+  if RUBY_ENGINE == 'jruby'
+    module Postgres
+      autoload :Connection, "mini_sql/postgres_jdbc/connection"
+      autoload :DeserializerCache, "mini_sql/postgres_jdbc/deserializer_cache"
+    end
+  else
+    module Postgres
+      autoload :Coders, "mini_sql/postgres/coders"
+      autoload :Connection, "mini_sql/postgres/connection"
+      autoload :DeserializerCache, "mini_sql/postgres/deserializer_cache"
+    end
 
-  module Sqlite
-    autoload :Connection, "mini_sql/sqlite/connection"
-    autoload :DeserializerCache, "mini_sql/sqlite/deserializer_cache"
+    module Sqlite
+      autoload :Connection, "mini_sql/sqlite/connection"
+      autoload :DeserializerCache, "mini_sql/sqlite/deserializer_cache"
+    end
   end
 end

data/lib/mini_sql/connection.rb

@@ -4,7 +4,9 @@ module MiniSql
   class Connection
 
     def self.get(raw_connection, options = {})
-      if (defined? ::PG::Connection) && (PG::Connection === raw_connection)
+      if (defined? ::PG::Connection) && (PG::Connection === raw_connection) 
+        Postgres::Connection.new(raw_connection, options)
+      elsif (defined? ::ArJdbc)
         Postgres::Connection.new(raw_connection, options)
       elsif (defined? ::SQLite3::Database) && (SQLite3::Database === raw_connection)
         Sqlite::Connection.new(raw_connection, options)

data/lib/mini_sql/postgres_jdbc/connection.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+module MiniSql
+  module Postgres
+    class Connection < MiniSql::Connection
+      class NumericCoder
+        def decode(string)
+          BigDecimal(string)
+        end
+      end
+
+      class IPAddrCoder
+        def decode(string)
+          IPAddr.new(string)
+        end
+      end
+
+      attr_reader :raw_connection, :type_map, :param_encoder
+
+      def self.default_deserializer_cache
+        @deserializer_cache ||= DeserializerCache.new
+      end
+
+      def self.typemap
+        @type_map ||= {
+            "numeric" => NumericCoder.new,
+            "inet" => IPAddrCoder.new,
+            "cidr" => IPAddrCoder.new
+        }
+      end
+
+      # Initialize a new MiniSql::Postgres::Connection object
+      #
+      # @param raw_connection [PG::Connection] an active connection to PG
+      # @param deserializer_cache [MiniSql::DeserializerCache] a cache of field names to deserializer, can be nil
+      # @param type_map [PG::TypeMap] a type mapper for all results returned, can be nil
+      def initialize(raw_connection, args = nil)
+        @raw_connection = raw_connection
+        @deserializer_cache = (args && args[:deserializer_cache]) || self.class.default_deserializer_cache
+        @param_encoder = (args && args[:param_encoder]) || InlineParamEncoder.new(self)
+      end
+
+      # Returns a flat array containing all results.
+      # Note, if selecting multiple columns array will be flattened
+      #
+      # @param sql [String] the query to run
+      # @param params [Array or Hash], params to apply to query
+      # @return [Object] a flat array containing all results
+      def query_single(sql, *params)
+        result = run(sql, params)
+        if result.length == 1
+          result.values[0]
+        else
+          result.values.each_with_object([]) { |value, array| array.concat value }
+        end
+      end
+
+      def query(sql, *params)
+        result = run(sql, params)
+        @deserializer_cache.materialize(result)
+      end
+
+      def exec(sql, *params)
+        result = run(sql, params)
+        if result.kind_of? Integer
+          result
+        else
+          result.length
+        end
+      end
+
+      def query_hash(sql, *params)
+        run(sql, params).to_a
+      end
+
+      def build(sql)
+        Builder.new(self, sql)
+      end
+
+      def escape_string(str)
+        raw_connection.escape_string(str)
+      end
+
+      private
+
+      def run(sql, params)
+        sql = param_encoder.encode(sql, *params) if params && params.length > 0
+        conn = raw_connection
+        conn.typemap = self.class.typemap
+        conn.execute(sql)
+      ensure
+        # Force unsetting of typemap since we don't want mixed AR usage to continue to use these extra converters.
+        conn.typemap = nil
+      end
+    end
+  end
+end

data/lib/mini_sql/postgres_jdbc/deserializer_cache.rb

@@ -0,0 +1,67 @@
+module MiniSql
+  module Postgres
+    class DeserializerCache
+
+    DEFAULT_MAX_SIZE = 500
+
+    def initialize(max_size = nil)
+      @cache = {}
+      @max_size = max_size || DEFAULT_MAX_SIZE
+    end
+
+    def materialize(result)
+
+      return [] if result.ntuples == 0
+
+      key = result.fields
+
+      # trivial fast LRU implementation
+      materializer = @cache.delete(key)
+      if materializer
+        @cache[key] = materializer
+      else
+        materializer = @cache[key] = new_row_matrializer(result)
+        @cache.shift if @cache.length > @max_size
+      end
+
+      i = 0
+      r = []
+      # quicker loop
+      while i < result.ntuples
+        r << materializer.materialize(result, i)
+        i += 1
+      end
+      r
+    end
+
+    private
+
+    def new_row_matrializer(result)
+      fields = result.fields
+
+      Class.new do
+        attr_accessor(*fields)
+
+        # AM serializer support
+        alias :read_attribute_for_serialization :send
+
+        def to_h
+          r = {}
+          instance_variables.each do |f|
+            r[f.to_s.sub('@','').to_sym] = instance_variable_get(f)
+          end
+          r
+        end
+
+        instance_eval <<~RUBY
+            def materialize(pg_result, index)
+              r = self.new
+              #{col=-1; fields.map{|f| "r.#{f} = pg_result.getvalue(index, #{col+=1})"}.join("; ")}
+              r
+            end
+        RUBY
+      end
+    end
+  end
+end
+end

data/lib/mini_sql/version.rb

@@ -1,3 +1,3 @@
 module MiniSql
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/mini_sql.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://discourse.org"
   spec.license       = "MIT"
 
+  spec.platform = 'java' if RUBY_ENGINE == 'jruby'
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
@@ -25,9 +27,14 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "pg", "> 1"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-minitest", "~> 2.4"
   spec.add_development_dependency "activesupport", "~> 5.2"
-  spec.add_development_dependency "sqlite3", "~> 1.3"
+
+  if RUBY_ENGINE == 'jruby'
+    spec.add_development_dependency "activerecord-jdbcpostgresql-adapter", "~> 52.2"
+  else
+    spec.add_development_dependency "pg", "> 1"
+    spec.add_development_dependency "sqlite3", "~> 1.3"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_sql
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,8 @@ files:
 - lib/mini_sql/postgres/coders.rb
 - lib/mini_sql/postgres/connection.rb
 - lib/mini_sql/postgres/deserializer_cache.rb
+- lib/mini_sql/postgres_jdbc/connection.rb
+- lib/mini_sql/postgres_jdbc/deserializer_cache.rb
 - lib/mini_sql/sqlite/connection.rb
 - lib/mini_sql/sqlite/deserializer_cache.rb
 - lib/mini_sql/version.rb
@@ -173,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A fast, safe, simple direct SQL executor