db2_query 0.2.0 → 0.3.1

data/lib/db2_query/tasks/database.rake

@@ -1,52 +1,35 @@
 # frozen_string_literal: true
 
+require "db2_query"
+
 DB2_QUERY_DATABASE_TEMPLATE ||= <<-EOF
 # frozen_string_literal: true
-# Database configuration example
+
 development:
-  primary:
-    adapter: db2_query
-    dsn: iseries
-    uid: <%= ENV["ISERIES_UID"] %>
-    pwd: <%= ENV["ISERIES_PWD"] %>
-  secondary:
-    adapter: db2_query
-    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
+  idle: 5
+  pool: 5
+  timeout: 5
+
 test:
-  primary:
-    adapter: db2_query
-    dsn: iseries
-    uid: <%= ENV["ISERIES_UID"] %>
-    pwd: <%= ENV["ISERIES_PWD"] %>
-  secondary:
-    adapter: db2_query
-    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
+  idle: 5
+  pool: 5
+  timeout: 5
+
+production:
+  dsn: TODO
+  idle: 5
+  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/init.rake

@@ -6,4 +6,4 @@ namespace :db2query do
     Rake::Task["db2query:initializer"].invoke
     Rake::Task["db2query:database"].invoke
   end
-end
+end

data/lib/db2_query/tasks/initializer.rake

@@ -1,19 +1,26 @@
 # frozen_string_literal: true
 
+require "db2_query"
+
 DB2_QUERY_INITIALIZER_TEMPLATE ||= <<-EOF
 # frozen_string_literal: true
-
-# Example
+require "db2_query"
 require "db2_query/formatter"
-class FirstNameFormatter < Db2Query::AbstractFormatter
-  def format(value)
-    "Dr." + value
-  end
-end
 
-Db2Query::Formatter.registration do |format|
-  format.register(:first_name_formatter, FirstNameFormatter)
+Db2Query::Base.initiation do |base|
+  base.establish_connection
 end
+
+# Example
+#class FirstNameFormatter < Db2Query::AbstractFormatter
+#  def format(value)
+#    "Dr." + value
+#  end
+#end
+
+#Db2Query::Formatter.registration do |format|
+#  format.register(:first_name_formatter, FirstNameFormatter)
+#end
 EOF
 
 namespace :db2query do
@@ -22,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|
@@ -31,4 +38,4 @@ namespace :db2query do
       puts "  File '#{initializer_path}' created."
     end
   end
-end
+end

data/lib/db2_query/version.rb

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

metadata

@@ -1,71 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: db2_query
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - yohanes_l
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-odbc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.99999'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.99999'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.0.3.1
-- !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.0.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -79,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -121,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -135,13 +95,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: connection_pool
   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:
@@ -149,22 +109,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  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 5 & Rails 6 plugin for handling Db2 SQL SIUD statement (SELECT,
+  INSERT, UPDATE, DELETE) by using ODBC connection.
 email:
-- yohanes.lumentut@yahoo.com
+- yohanes.lumentut@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -172,26 +133,27 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- lib/active_record/connection_adapters/db2_query_adapter.rb
 - lib/db2_query.rb
 - lib/db2_query/base.rb
 - lib/db2_query/config.rb
-- lib/db2_query/connection_handling.rb
+- lib/db2_query/connection.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:
@@ -207,8 +169,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: Rails Db2 ODBC plugin
 test_files: []

data/lib/active_record/connection_adapters/db2_query_adapter.rb

@@ -1,203 +0,0 @@
-# frozen_string_literal: true
-
-require "odbc_utf8"
-require "db2_query/odbc_connector"
-require "db2_query/database_statements"
-
-module ActiveRecord
-  module ConnectionHandling
-    def db2_query_connection(config)
-      conn_type = (config.keys & DB2Query::CONNECTION_TYPES).first
-      if conn_type.nil?
-        raise ArgumentError, "No data source name (:dsn) or connection string (:conn_str) provided."
-      end
-      connector = DB2Query::ODBCConnector.new(conn_type, config)
-      ConnectionAdapters::DB2QueryConnection.new(connector, config)
-    end
-  end
-
-  module ConnectionAdapters
-    class DB2QueryConnection
-      include DB2Query::DatabaseStatements
-      include ActiveSupport::Callbacks
-      define_callbacks :checkout, :checkin
-
-      set_callback :checkin, :after, :enable_lazy_transactions!
-
-      attr_accessor :pool
-      attr_reader :owner, :connector, :lock
-      alias :in_use? :owner
-
-      def initialize(connector, config)
-        @connector = connector
-        @instrumenter  = ActiveSupport::Notifications.instrumenter
-        @config = config
-        @pool = ActiveRecord::ConnectionAdapters::NullPool.new
-        @lock = ActiveSupport::Concurrency::LoadInterlockAwareMonitor.new
-        connect
-      end
-
-      def connect
-        @connection = connector.connect
-        @connection.use_time = true
-      end
-
-      def active?
-        @connection.connected?
-      end
-
-      def reconnect!
-        disconnect!
-        connect
-      end
-      alias reset! reconnect!
-
-      def disconnect!
-        if @connection.connected?
-          @connection.commit
-          @connection.disconnect
-        end
-      end
-
-      def check_version
-      end
-
-      def enable_lazy_transactions!
-        @lazy_transactions_enabled = true
-      end
-
-      def lease
-        if in_use?
-          msg = +"Cannot lease connection, "
-          if @owner == Thread.current
-            msg << "it is already leased by the current thread."
-          else
-            msg << "it is already in use by a different thread: #{@owner}. " \
-                   "Current thread: #{Thread.current}."
-          end
-          raise ActiveRecordError, msg
-        end
-
-        @owner = Thread.current
-      end
-
-      def verify!
-        reconnect! unless active?
-      end
-
-      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
-          ActiveRecord::StatementInvalid.new(message, sql: sql, binds: binds)
-        end
-      end
-
-      def expire
-        if in_use?
-          if @owner != Thread.current
-            raise ActiveRecordError, "Cannot expire connection, " \
-              "it is owned by a different thread: #{@owner}. " \
-              "Current thread: #{Thread.current}."
-          end
-
-          @idle_since = Concurrent.monotonic_time
-          @owner = nil
-        else
-          raise ActiveRecordError, "Cannot expire connection, it is not currently leased."
-        end
-      end
-
-      def steal!
-        if in_use?
-          if @owner != Thread.current
-            pool.send :remove_connection_from_thread_cache, self, @owner
-
-            @owner = Thread.current
-          end
-        else
-          raise ActiveRecordError, "Cannot steal connection, it is not currently leased."
-        end
-      end
-
-      def seconds_idle # :nodoc:
-        return 0 if in_use?
-        Concurrent.monotonic_time - @idle_since
-      end
-
-      private
-        def type_map
-          @type_map ||= Type::TypeMap.new.tap do |mapping|
-            initialize_type_map(mapping)
-          end
-        end
-
-        def alias_type(map, new_type, old_type)
-          map.register_type(new_type) do |_, *args|
-            map.lookup(old_type, *args)
-          end
-        end
-
-        def initialize_type_map(map)
-          map.register_type "boolean",              Type::Boolean.new
-          map.register_type ODBC::SQL_CHAR,         Type::String.new
-          map.register_type ODBC::SQL_LONGVARCHAR,  Type::Text.new
-          map.register_type ODBC::SQL_TINYINT,      Type::Integer.new(limit: 4)
-          map.register_type ODBC::SQL_SMALLINT,     Type::Integer.new(limit: 8)
-          map.register_type ODBC::SQL_INTEGER,      Type::Integer.new(limit: 16)
-          map.register_type ODBC::SQL_BIGINT,       Type::BigInteger.new(limit: 32)
-          map.register_type ODBC::SQL_REAL,         Type::Float.new(limit: 24)
-          map.register_type ODBC::SQL_FLOAT,        Type::Float.new
-          map.register_type ODBC::SQL_DOUBLE,       Type::Float.new(limit: 53)
-          map.register_type ODBC::SQL_DECIMAL,      Type::Float.new
-          map.register_type ODBC::SQL_NUMERIC,      Type::Integer.new
-          map.register_type ODBC::SQL_BINARY,       Type::Binary.new
-          map.register_type ODBC::SQL_DATE,         Type::Date.new
-          map.register_type ODBC::SQL_DATETIME,     Type::DateTime.new
-          map.register_type ODBC::SQL_TIME,         Type::Time.new
-          map.register_type ODBC::SQL_TIMESTAMP,    Type::DateTime.new
-          map.register_type ODBC::SQL_GUID,         Type::String.new
-
-          alias_type map, ODBC::SQL_BIT,            "boolean"
-          alias_type map, ODBC::SQL_VARCHAR,        ODBC::SQL_CHAR
-          alias_type map, ODBC::SQL_WCHAR,          ODBC::SQL_CHAR
-          alias_type map, ODBC::SQL_WVARCHAR,       ODBC::SQL_CHAR
-          alias_type map, ODBC::SQL_WLONGVARCHAR,   ODBC::SQL_LONGVARCHAR
-          alias_type map, ODBC::SQL_VARBINARY,      ODBC::SQL_BINARY
-          alias_type map, ODBC::SQL_LONGVARBINARY,  ODBC::SQL_BINARY
-          alias_type map, ODBC::SQL_TYPE_DATE,      ODBC::SQL_DATE
-          alias_type map, ODBC::SQL_TYPE_TIME,      ODBC::SQL_TIME
-          alias_type map, ODBC::SQL_TYPE_TIMESTAMP, ODBC::SQL_TIMESTAMP
-        end
-    end
-  end
-end