db2_query 0.2.3 → 0.3.0

data/lib/db2_query/core.rb

@@ -1,37 +1,36 @@
 # frozen_string_literal: true
 
-require "active_record/database_configurations"
+module Db2Query
+  class DbClient
+    attr_reader :dsn
 
-module DB2Query
-  module Core
-    extend ActiveSupport::Concern
-
-    included do
-      def self.configurations=(config)
-        @@configurations = ActiveRecord::DatabaseConfigurations.new(config)
-      end
-      self.configurations = {}
+    delegate :run, :do, to: :client
 
-      def self.configurations
-        @@configurations
-      end
-
-      mattr_accessor :connection_handlers, instance_accessor: false, default: {}
-
-      class_attribute :default_connection_handler
+    def initialize(dsn)
+      @dsn = dsn
+      @client = retrieve_db_client
+    end
 
-      def self.connection_handler
-        Thread.current.thread_variable_get("db2q_connection_handler") || default_connection_handler
-      end
+    def retrieve_db_client
+      ODBC.connect(dsn)
+    end
 
-      def self.connection_handler=(handler)
-        Thread.current.thread_variable_set("db2q_connection_handler", handler)
+    def client
+      unless @client.connected?
+        @client = retrieve_db_client
       end
+      @client
+    end
+  end
 
-      self.default_connection_handler = DB2Query::ConnectionHandler.new
+  module Core
+    extend ActiveSupport::Concern
+    included do
+      @@connection = nil
+      @@mutex = Mutex.new
     end
 
-    module ClassMethods
+    class_methods do
       def initiation
         yield(self) if block_given?
       end
@@ -40,9 +39,25 @@ module DB2Query
         formatters.store(attr_name, format)
       end
 
+      def connection
+        @@connection || create_connection
+      end
+
+      def create_connection
+        @@mutex.synchronize do
+          return @@connection if @@connection
+          @@connection = Connection.new(config) { DbClient.new(config[:dsn]) }
+        end
+      end
+
+      def establish_connection
+        load_database_configurations
+        create_connection
+      end
+
       def query(name, body)
         if defined_method_name?(name)
-          raise DB2Query::Error, "You tried to define a scope named \"#{name}\" " \
+          raise Db2Query::Error, "You tried to define a scope named \"#{name}\" " \
             "on the model \"#{self.name}\", but DB2Query already defined " \
             "a class method with the same name."
         end
@@ -52,14 +67,33 @@ module DB2Query
             body.call(*args)
           end
         elsif body.is_a?(String)
-          sql = body
+          sql = body.strip
           singleton_class.define_method(name) do |*args|
             connection.exec_query(formatters, sql, args)
           end
         else
-          raise DB2Query::Error, "The query body needs to be callable or is a sql string"
+          raise Db2Query::Error, "The query body needs to be callable or is a sql string"
         end
       end
+      alias define query
+
+      def fetch(sql, args)
+        validate_sql(sql)
+        connection.exec_query({}, sql, args)
+      end
+
+      def fetch_list(sql, args)
+        validate_sql(sql)
+        raise Db2Query::Error, "Missing @list pointer at SQL" if sql.scan(/\@list+/).length == 0
+        raise Db2Query::Error, "The arguments should be an array of list" unless args.is_a?(Array)
+        connection.exec_query({}, sql.gsub("@list", "'#{args.join("', '")}'"), [])
+      end
+
+      def sql_with_extention(sql, extention)
+        validate_sql(sql)
+        raise Db2Query::Error, "Missing @extention pointer at SQL" if sql.scan(/\@extention+/).length == 0
+        sql.gsub("@extention", extention.strip)
+      end
 
       private
         def formatters
@@ -78,11 +112,18 @@ module DB2Query
             sql_statement = allocate.method(sql_method).call
 
             unless sql_statement.is_a? String
-              raise DB2Query::Error, "Query methods must return a SQL statement string!"
+              raise Db2Query::Error, "Query methods must return a SQL statement string!"
             end
 
             query(method_name, sql_statement)
 
+            if args[0].is_a?(Hash)
+              keys = sql_statement.scan(/\$\S+/).map { |key| key.gsub!(/[$=]/, "") }
+              rearrange_args = {}
+              keys.each { |key| rearrange_args[key.to_sym] = args[0][key.to_sym] }
+              args[0] = rearrange_args
+            end
+
             method(method_name).call(*args)
           elsif connection.respond_to?(method_name)
             connection.send(method_name, *args)
@@ -90,6 +131,10 @@ module DB2Query
             super
           end
         end
+
+        def validate_sql(sql)
+          raise Db2Query::Error, "SQL have to be in string format" unless sql.is_a?(String)
+        end
     end
   end
 end

data/lib/db2_query/error.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module DB2Query
+module Db2Query
   class Error < StandardError
   end
 

data/lib/db2_query/formatter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module DB2Query
+module Db2Query
   module Formatter
     def self.register(name, klass)
       self.format_registry.store(name.to_sym, klass.new)
@@ -21,7 +21,7 @@ module DB2Query
 
   class AbstractFormatter
     def format(value)
-      raise DB2Query::Error, "Implement format method in your subclass."
+      raise Db2Query::Error, "Implement format method in your subclass."
     end
   end
 end

data/lib/db2_query/logger.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Db2Query
+  module Logger
+    def translate_exception_class(e, sql, binds)
+      message = "#{e.class.name}: #{e.message}"
+
+      exception = translate_exception(
+        e, message: message, sql: sql, binds: binds
+      )
+      exception.set_backtrace e.backtrace
+      exception
+    end
+
+    def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil) # :doc:
+      @instrumenter.instrument(
+        "sql.active_record",
+        sql:               sql,
+        name:              name,
+        binds:             binds,
+        type_casted_binds: type_casted_binds,
+        statement_name:    statement_name,
+        connection_id:     object_id,
+        connection:        self) do
+        @lock.synchronize do
+          yield
+        end
+      rescue => e
+        raise translate_exception_class(e, sql, binds)
+      end
+    end
+
+    def translate_exception(exception, message:, sql:, binds:)
+      case exception
+      when RuntimeError
+        exception
+      else
+        StatementInvalid.new(message, sql: sql, binds: binds)
+      end
+    end
+  end
+end

data/lib/db2_query/railtie.rb

@@ -3,18 +3,13 @@
 require "db2_query"
 require "rails"
 
-module DB2Query
-  class Railtie < Rails::Railtie
+module Db2Query
+  class Railtie < ::Rails::Railtie
     railtie_name :db2_query
 
     rake_tasks do
       path = File.expand_path(__dir__)
       Dir.glob("#{path}/tasks/*.rake").each { |f| load f }
     end
-
-    initializer "db2_query.database_initialization" do
-      DB2Query::Base.configurations = DB2Query.config
-      DB2Query::Base.establish_connection :primary
-    end
   end
 end

data/lib/db2_query/result.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module DB2Query
+module Db2Query
   class Result < ActiveRecord::Result
     attr_reader :formatters
 
@@ -9,6 +9,14 @@ module DB2Query
       super(columns, rows, column_types)
     end
 
+    def includes_column?(name)
+      @columns.include? name
+    end
+
+    def record
+      @record ||= Record.new(rows[0], columns, formatters)
+    end
+
     def records
       @records ||= rows.map do |row|
         Record.new(row, columns, formatters)
@@ -26,7 +34,7 @@ module DB2Query
 
       entries[10] = "..." if entries.size == 11
 
-      "#<#{self.class.name} @records=[#{entries.join(', ')}]>"
+      "#<#{self.class.name} [#{entries.join(', ')}]>"
     end
 
     class Record
@@ -59,7 +67,7 @@ module DB2Query
           column = col.downcase
           format_name = formatters[column.to_sym]
           unless format_name.nil?
-            formatter = DB2Query::Formatter.lookup(format_name)
+            formatter = Db2Query::Formatter.lookup(format_name)
             val = formatter.format(val)
           end
           [column, val]

data/lib/db2_query/tasks/database.rake

@@ -1,48 +1,32 @@
 # frozen_string_literal: true
 
+require "db2_query"
+
 DB2_QUERY_DATABASE_TEMPLATE ||= <<-EOF
 # frozen_string_literal: true
-# Database configuration example
+
 development:
-  primary:
-    dsn: iseries
-    uid: <%= ENV["ISERIES_UID"] %>
-    pwd: <%= ENV["ISERIES_PWD"] %>
-  secondary:
-    conn_string:
-      driver: DB2
-      database: ARUNIT2
-      dbalias: ARUNIT2
-      hostname: LOCALHOST
-      currentschema: LIBTEST
-      port: "0"
-      protocol: IPC
-      uid: <%= ENV["DB2EC_UID"] %>
-      pwd: <%= ENV["DB2EC_PWD"] %>
+  dsn: TODO
+  pool: 5
+  timeout: 5
+
 test:
-  primary:
-    dsn: iseries
-    uid: <%= ENV["ISERIES_UID"] %>
-    pwd: <%= ENV["ISERIES_PWD"] %>
-  secondary:
-    conn_string:
-      driver: DB2
-      database: ARUNIT2
-      dbalias: ARUNIT2
-      hostname: LOCALHOST
-      currentschema: LIBTEST
-      port: "0"
-      protocol: IPC
-      uid: <%= ENV["DB2EC_UID"] %>
-      pwd: <%= ENV["DB2EC_PWD"] %>
+  dsn: TODO
+  pool: 5
+  timeout: 5
+
+production:
+  dsn: TODO
+  pool: 5
+  timeout: 5
 EOF
 
 namespace :db2query do
   desc "Create Database configuration file"
   task :database do
-    database_path = "#{Rails.root}/config/db2query_database.yml"
+    database_path = "#{Rails.root}/config/db2query.yml"
     if File.exist?(database_path)
-      raise ArgumentError, "File exists."
+      raise Db2Query::Error, "Db2Query database config file exists, please check first"
     else
       puts "  Creating database config file ..."
       File.open(database_path, "w") do |file|

data/lib/db2_query/tasks/initializer.rake

@@ -1,25 +1,24 @@
 # frozen_string_literal: true
 
+require "db2_query"
+
 DB2_QUERY_INITIALIZER_TEMPLATE ||= <<-EOF
 # frozen_string_literal: true
-
 require "db2_query"
 require "db2_query/formatter"
 
-DB2Query::Base.initiation do |base|
-  base.configurations = base.parent.config
-  base.establish_connection ENV['RAILS_ENV'].to_sym
+Db2Query::Base.initiation do |base|
+  base.establish_connection
 end
 
 # Example
-
-class FirstNameFormatter < DB2Query::AbstractFormatter
+class FirstNameFormatter < Db2Query::AbstractFormatter
   def format(value)
     "Dr." + value
   end
 end
 
-DB2Query::Formatter.registration do |format|
+Db2Query::Formatter.registration do |format|
   format.register(:first_name_formatter, FirstNameFormatter)
 end
 EOF
@@ -30,7 +29,7 @@ namespace :db2query do
     # Create initializer file
     initializer_path = "#{Rails.root}/config/initializers/db2query.rb"
     if File.exist?(initializer_path)
-      raise ArgumentError, "File exists."
+      raise Db2Query::Error, "Db2Query initializer file exists, please check first"
     else
       puts "  Creating initializer file ..."
       File.open(initializer_path, "w") do |file|

data/lib/db2_query/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-module DB2Query
-  VERSION = "0.2.3"
+module Db2Query
+  VERSION = "0.3.0"
 end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: db2_query
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - yohanes_l
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-odbc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.99999'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.99999'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,50 +81,62 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.3.2
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.2.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: ruby-odbc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Rails query plugin to fetch data from Db2 database by using ODBC connection.
+description: A Rails Db2 ODBC adapter
 email:
-- yohanes.lumentut@yahoo.com
+- yohanes.lumentut@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -134,26 +146,25 @@ files:
 - Rakefile
 - lib/db2_query.rb
 - lib/db2_query/base.rb
-- lib/db2_query/bind.rb
 - lib/db2_query/config.rb
 - lib/db2_query/connection.rb
-- lib/db2_query/connection_handling.rb
 - lib/db2_query/core.rb
-- lib/db2_query/database_statements.rb
 - lib/db2_query/error.rb
 - lib/db2_query/formatter.rb
-- lib/db2_query/odbc_connector.rb
+- lib/db2_query/logger.rb
 - lib/db2_query/railtie.rb
 - lib/db2_query/result.rb
 - lib/db2_query/tasks/database.rake
 - lib/db2_query/tasks/init.rake
 - lib/db2_query/tasks/initializer.rake
 - lib/db2_query/version.rb
-homepage: https://github.com/yohaneslumentut/db2_query
+homepage: https://github.com/yohaneslumentut
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/yohaneslumentut
+  source_code_uri: https://github.com/yohaneslumentut/db2_query
+  changelog_uri: https://github.com/yohaneslumentut/db2_query
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -169,8 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: DB2Query
+summary: Db2 ODBC adapter
 test_files: []