db2_query 0.1.0 → 0.2.0

data/lib/{tasks → db2_query/tasks}/database.rake

@@ -2,41 +2,43 @@
 
 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: SAMPLE
-      dbalias: SAMPLE
+      database: ARUNIT2
+      dbalias: ARUNIT2
       hostname: LOCALHOST
       currentschema: LIBTEST
       port: "0"
       protocol: IPC
       uid: <%= ENV["DB2EC_UID"] %>
       pwd: <%= ENV["DB2EC_PWD"] %>
-  secondary:
-    dsn: SAMPLE
-    uid: <%= ENV["DB2EC_UID"] %>
-    pwd: <%= ENV["DB2EC_PWD"] %>
-
 test:
   primary:
+    adapter: db2_query
+    dsn: iseries
+    uid: <%= ENV["ISERIES_UID"] %>
+    pwd: <%= ENV["ISERIES_PWD"] %>
+  secondary:
+    adapter: db2_query
     conn_string:
       driver: DB2
-      database: SAMPLE
-      dbalias: SAMPLE
+      database: ARUNIT2
+      dbalias: ARUNIT2
       hostname: LOCALHOST
       currentschema: LIBTEST
       port: "0"
       protocol: IPC
       uid: <%= ENV["DB2EC_UID"] %>
       pwd: <%= ENV["DB2EC_PWD"] %>
-  secondary:
-    dsn: SAMPLE
-    uid: <%= ENV["DB2EC_UID"] %>
-    pwd: <%= ENV["DB2EC_PWD"] %>
 EOF
 
 namespace :db2query do

data/lib/{tasks → 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/{tasks → db2_query/tasks}/initializer.rake

@@ -5,10 +5,9 @@ DB2_QUERY_INITIALIZER_TEMPLATE ||= <<-EOF
 
 # Example
 require "db2_query/formatter"
-
 class FirstNameFormatter < Db2Query::AbstractFormatter
   def format(value)
-    "First Name: " + value
+    "Dr." + value
   end
 end
 
@@ -32,4 +31,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.1.0"
+module DB2Query
+  VERSION = "0.2.0"
 end

metadata

@@ -1,17 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: db2_query
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - yohanes_l
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  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:
     - - "~>"
@@ -31,19 +45,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.0.3.1
 - !ruby/object:Gem::Dependency
-  name: ruby-odbc
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.99999'
+        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: '0.99999'
+        version: 6.0.3
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.3.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -152,26 +172,21 @@ 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/column.rb
-- lib/db2_query/connection.rb
+- lib/db2_query/config.rb
 - lib/db2_query/connection_handling.rb
-- lib/db2_query/database_configurations.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/log_subscriber.rb
 - lib/db2_query/odbc_connector.rb
-- lib/db2_query/path.rb
 - lib/db2_query/railtie.rb
 - lib/db2_query/result.rb
-- lib/db2_query/schema.rb
-- lib/db2_query/sql_validator.rb
+- lib/db2_query/tasks/database.rake
+- lib/db2_query/tasks/init.rake
+- lib/db2_query/tasks/initializer.rake
 - lib/db2_query/version.rb
-- lib/tasks/database.rake
-- lib/tasks/init.rake
-- lib/tasks/initializer.rake
 homepage: https://github.com/yohaneslumentut/db2_query
 licenses:
 - MIT

data/lib/db2_query/column.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Db2Query
-  class Column
-    attr_reader :name, :type, :formatter
-
-    FLOAT_TYPES = [ODBC::SQL_FLOAT, ODBC::SQL_DOUBLE, ODBC::SQL_DECIMAL, ODBC::SQL_REAL]
-    INTEGER_TYPES = [ODBC::SQL_TINYINT, ODBC::SQL_SMALLINT, ODBC::SQL_INTEGER, ODBC::SQL_BIGINT, ODBC::SQL_NUMERIC]
-
-    def initialize(name, type, format = nil)
-      @name = name
-      @type = type.to_i
-
-      @formatter = if custom_format?(format)
-        Formatter.lookup(format)
-      elsif float_type?
-        FloatFormatter.new
-      elsif integer_type?
-        IntegerFormatter.new
-      else
-        BareFormatter.new
-      end
-    end
-
-    def format(value)
-      formatter.format(value)
-    end
-
-    private
-      def custom_format?(format)
-        Formatter.registry.key?(format)
-      end
-
-      def float_type?
-        FLOAT_TYPES.include?(type)
-      end
-
-      def integer_type?
-        INTEGER_TYPES.include?(type)
-      end
-  end
-end

data/lib/db2_query/connection.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Db2Query
-  class Connection
-    include DatabaseStatements
-
-    attr_reader :connector, :db_name, :odbc_conn
-
-    def initialize(connector, db_name)
-      @connector = connector
-      @db_name = db_name.to_sym
-      connect
-    end
-
-    def connect
-      @odbc_conn = connector.connect
-      @odbc_conn.use_time = true
-    end
-
-    def active?
-      @odbc_conn.connected?
-    end
-
-    def disconnect!
-      @odbc_conn.drop_all
-      @odbc_conn.disconnect if active?
-    end
-
-    def reconnect!
-      disconnect!
-      connect
-    end
-    alias reset! reconnect!
-
-    def execute(sql, *args)
-      reset! unless active?
-      @odbc_conn.do(sql, *args)
-    end
-
-    def exec_query(sql, *args)
-      reset! unless active?
-      statement = @odbc_conn.run(sql, *args)
-      columns = statement.columns.values
-      rows = statement.to_a
-      [columns, rows]
-    ensure
-      statement.drop if statement
-    end
-  end
-end

data/lib/db2_query/database_configurations.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Db2Query
-  module DatabaseConfigurations
-    extend ActiveSupport::Concern
-
-    DEFAULT_ENV = -> { (Rails.env if defined?(Rails.env)) || ENV["RAILS_ENV"].presence || ENV["RACK_ENV"].presence }
-
-    included do |base|
-      @@configurations = Hash.new
-
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def configurations
-        @@configurations
-      end
-
-      def load_database_configurations(path = nil)
-        file_path = path.nil? ? Path.database_config_file : path
-
-        if File.exist?(file_path)
-          file = File.read(file_path)
-          @@configurations = YAML.load(ERB.new(file).result)[DEFAULT_ENV.call]
-        else
-          raise Error, "Could not load db2query database configuration. No such file - #{file_path}"
-        end
-      end
-
-      def configurations_databases
-        self.load_database_configurations if self.configurations.nil?
-        @@configurations.keys
-      end
-
-      private
-        def extract_configuration(db_name)
-          configs = @@configurations[db_name.to_s]
-          conn_config = configs.nil? ? configs : configs.transform_keys(&:to_sym)
-          conn_type = (conn_config.keys & ODBCConnector::CONNECTION_TYPES).first
-
-          if conn_type.nil?
-            raise Error, "No data source name (:dsn) or connection string (:conn_str) provided."
-          end
-
-          [conn_type, conn_config]
-        end
-    end
-  end
-end

data/lib/db2_query/error.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module Db2Query
-  class Error < ArgumentError; end
-end

data/lib/db2_query/log_subscriber.rb

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Db2Query
-  class LogSubscriber < ActiveSupport::LogSubscriber
-    # Embed in a String to clear all previous ANSI sequences.
-    CLEAR   = "\e[0m"
-    BOLD    = "\e[1m"
-
-    # Colors
-    BLACK   = "\e[30m"
-    RED     = "\e[31m"
-    GREEN   = "\e[32m"
-    YELLOW  = "\e[33m"
-    BLUE    = "\e[34m"
-    MAGENTA = "\e[35m"
-    CYAN    = "\e[36m"
-    WHITE   = "\e[37m"
-
-    def sql(event)
-      class_load_duration = color("#{event.payload[:name]} Load (#{event.duration.round(2)}ms)", :cyan, true)
-      sql_statement = color("#{event.payload[:sql]}", :blue, true)
-      message = "  #{class_load_duration} #{sql_statement}"
-
-      if event.payload[:binds].size > 0
-        binds = color("#{event.payload[:binds]}", :white)
-        message = "#{message} [#{binds}]"
-      end
-
-      puts message
-    end
-
-    def schema_task(event)
-      puts color("  Done (#{(event.duration).round(2)}ms)", :green, true)
-    end
-
-    def schema_task_perform(event)
-      task_name = color(":#{event.payload[:task_name]}", :white, true)
-      schema = color("#{event.payload[:schema]}", :white, true)
-      puts "- Performing #{task_name} in #{schema} ..."
-    end
-
-    private
-      def color(text, color, bold = false) # :doc:
-        return text unless colorize_logging
-        color = self.class.const_get(color.upcase) if color.is_a?(Symbol)
-        bold  = bold ? BOLD : ""
-        "#{bold}#{color}#{text}#{CLEAR}"
-      end
-  end
-end

data/lib/db2_query/path.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Db2Query
-  module Path
-    def self.database_config_file
-      @@database_config_file ||= nil
-    end
-
-    def self.database_config_file=(file_path)
-      @@database_config_file ||= file_path
-    end
-
-    def self.database_config_file_exists?
-      File.exist?(self.database_config_file)
-    end
-  end
-end

data/lib/db2_query/schema.rb

@@ -1,113 +0,0 @@
-# frozen_string_literal: true
-
-module Db2Query
-  class Schema
-    include SQLValidator
-
-    attr_accessor :config, :current_schema
-
-    def initialize
-      @config = Config.new
-    end
-
-    def connection
-      Base.connection
-    end
-
-    def schema
-      config.schema
-    end
-
-    def sql_files_dir(path)
-      config.sql_files_dir = path
-    end
-
-    def is_valid_schema?
-      connection.current_schema == config.schema
-    end
-
-    def perform_tasks(&block)
-      raise Error, "#{config.main_library} is not connection's current schema" unless is_valid_schema?
-
-      if Base.connection.nil? && config.init_connection
-        Base.establish_connection
-      end
-
-      puts "\n# Perform Schema Tasks: \n\n"
-
-      instance_eval(&block)
-
-      puts "\n"
-    end
-
-    def sql(sql_statement)
-      raise Error, "Task only for SQL execute commands." if query_command?(sql_statement)
-      sql_statement
-    end
-
-    def file(file_name)
-      sql(File.read("#{config.sql_files_dir}/#{file_name}"))
-    end
-
-    def task(task_name, sql = nil, *args)
-      Task.new(schema, task_name).perform do
-        if block_given?
-          yield(sql)
-        else
-          execute(sql, *args)
-        end
-      end
-    end
-
-    def execute(sql, *args)
-      connection.execute(sql, *args)
-    rescue ::ODBC::Error => e
-      raise Error, "Unable to execute SQL - #{e}"
-    end
-
-    def tables_in_schema
-      connection.query_values <<-SQL
-        SELECT table_name FROM SYSIBM.SQLTABLES
-        WHERE table_schem='#{schema}' AND table_type='TABLE'
-      SQL
-    end
-
-    def self.initiation(&block)
-      new.initiation(&block)
-    end
-
-    def initiation(&block)
-      instance_eval(&block)
-    end
-
-    class Task
-      attr_reader :instrumenter, :schema, :task_name, :start_time, :finish_time
-
-      def initialize(schema, task_name)
-        @schema = schema
-        @task_name = task_name
-        @instrumenter = ActiveSupport::Notifications.instrumenter
-      end
-
-      def perform
-        instrumenter.instrument("schema_task_perform.db2_query", payload)
-        instrumenter.start("schema_task.db2_query", payload)
-        yield
-        instrumenter.finish("schema_task.db2_query", payload)
-      end
-
-      private
-        def payload
-          { task_name: task_name, schema: schema }
-        end
-    end
-
-    class Config
-      attr_accessor :initial_tasks, :init_connection, :schema, :sql_files_dir
-
-      def initialize
-        @init_connection = false
-      end
-    end
-  end
-end