db2_query 0.2.3 → 0.3.3

data/lib/db2_query/type/decimal.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Db2Query
+  module Type
+    class Decimal < Value
+      def type
+        :decimal
+      end
+
+      def deserialize(value)
+        value.to_f
+      end
+    end
+  end
+end

data/lib/db2_query/type/integer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Db2Query
+  module Type
+    class Integer < Value
+      def type
+        :integer
+      end
+
+      def deserialize(value)
+        value.to_i
+      end
+    end
+  end
+end

data/lib/db2_query/type/string.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Db2Query
+  module Type
+    class String < Value
+      DEFAULT = { trim: false }
+
+      def initialize(options = DEFAULT)
+        super(options)
+      end
+
+      def type
+        :string
+      end
+
+      def deserialize(value)
+        value.strip! if options[:trim]
+        case value
+        when ::String then
+          if value == "null"
+            nil
+          else
+            ::String.new(value)
+          end
+        else value.to_s
+        end
+      end
+    end
+  end
+end

data/lib/db2_query/type/text.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Db2Query
+  module Type
+    class Text < String
+      def type
+        :text
+      end
+    end
+  end
+end

data/lib/db2_query/type/time.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Db2Query
+  module Type
+    class Time < Value
+      def type
+        :time
+      end
+
+      def serialize(value)
+        if value.is_a?(::String)
+          case value
+          when /\A(\d\d)[:,.](\d\d)[:,.](\d\d)\z/
+            quote(value)
+          else
+            nil
+          end
+        elsif value.is_a?(::Time)
+          quote(value.strftime("%T"))
+        else
+          nil
+        end
+      end
+
+      def deserialize(value)
+        value.strftime("%H:%M:%S")
+      end
+    end
+  end
+end

data/lib/db2_query/type/timestamp.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Db2Query
+  module Type
+    class Timestamp < Value
+      def type
+        :time
+      end
+
+      def serialize(value)
+        if value.is_a?(::String)
+          case value
+          when  /\A(\d{4})-(\d\d)-(\d\d)-(\d\d).(\d\d).(\d\d).(\d{1,6})\z/
+            quote(value)
+          else
+            nil
+          end
+        elsif value.is_a?(::DateTime) || value.is_a?(::Time)
+          quote(value.strftime("%F-%H.%M.%S.%6N"))
+        else
+          nil
+        end
+      end
+
+      def deserialize(value)
+        value
+      end
+    end
+  end
+end

data/lib/db2_query/type/value.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Db2Query
+  module Type
+    class Value
+      attr_reader :options
+
+      def initialize(options = {})
+        @options = options
+      end
+
+      def type_name
+        :value
+      end
+
+      def serialize(value)
+        value
+      end
+
+      def deserialize(value)
+        value
+      end
+
+      def quote(value)
+        "'#{value}'"
+      end
+    end
+  end
+end

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.3"
 end

data/lib/db2_query.rb

@@ -1,25 +1,49 @@
-# frozen_string_literal:true
+# frozen_string_literal: true
 
-require "yaml"
-require "erb"
-require "active_record"
 require "active_support"
-require "db2_query/config"
+require "active_support/concurrency/load_interlock_aware_monitor"
+require "active_record"
+require "active_model/type"
+require "connection_pool"
+require "odbc_utf8"
 require "db2_query/error"
-require "db2_query/connection_handling"
 
-module DB2Query
-  extend ActiveSupport::Autoload
+module Db2Query
+  autoload :Version, "db2_query/version"
+  autoload :Error, "db2_query/error"
+  autoload :Config, "db2_query/config"
+  autoload :Logger, "db2_query/logger"
+  autoload :DbClient, "db2_query/db_client"
+  autoload :DbStatements, "db2_query/db_statements"
+  autoload :Validations, "db2_query/validations"
+  autoload :Helper, "db2_query/helper"
+  autoload :Quoting, "db2_query/quoting"
+  autoload :FieldType, "db2_query/field_type"
 
-  autoload :Version
-  autoload :Base
-  autoload :Bind
-  autoload :Core
-  autoload :DatabaseStatements
-  autoload :Connection
-  autoload :ODBCConnector
-  autoload :Formatter
-  autoload :Result
+  module Type
+    autoload :Value, "db2_query/type/value"
+    autoload :Binary, "db2_query/type/binary"
+    autoload :Boolean, "db2_query/type/boolean"
+    autoload :Decimal, "db2_query/type/decimal"
+    autoload :String, "db2_query/type/string"
+    autoload :Text, "db2_query/type/text"
+    autoload :Integer, "db2_query/type/integer"
+    autoload :Time, "db2_query/type/time"
+    autoload :Timestamp, "db2_query/type/timestamp"
+    autoload :Date, "db2_query/type/date"
+  end
 
-  require "db2_query/railtie" if defined?(Rails)
+  autoload :SqlStatement, "db2_query/sql_statement"
+  autoload :Query, "db2_query/query"
+  autoload :Definitions, "db2_query/definitions"
+  autoload :DbConnection, "db2_query/db_connection"
+  autoload :Result, "db2_query/result"
+  autoload :Core, "db2_query/core"
+  autoload :Base, "db2_query/base"
+
+  def self.root
+    __dir__
+  end
 end
+
+require "db2_query/railtie" if defined?(Rails)

data/lib/rails/generators/query/USAGE

@@ -0,0 +1,15 @@
+Description:
+  Stubs out a new query. Pass the query name, either
+    CamelCased or under_scored, and an optional list of its methods as arguments.
+
+    To create a query within a module, just use namespace pattern as the other rails generators do.
+
+    To create query class methods, you can use 3 options:
+      1. Plain SQL methods --defines
+      2. Query Methods with SQL string, --queries
+      3. Query Methods with lambda, --lambdas
+
+Example:
+  $ rails g query NameSpace::Name --queries query_1 --defines query_2 --lambdas query_3
+      create app/queries/name_space/name_query.rb
+      create test/queries/name_space/name_query_test.rb

data/lib/rails/generators/query/query_generator.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+require "fileutils"
+
+module Rails
+  module Generators
+    class QueryGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path("../templates", __FILE__)
+
+      class_option :skip_unit_test, type: :boolean, default: false, desc: "Skip unit test file creation"
+      class_option :defines, type: :array, default: [], desc: "Plain query method options"
+      class_option :queries, type: :array, default: [], desc: "Query method SQL options"
+      class_option :lambdas, type: :array, default: [], desc: "Query method with callable args"
+
+      def create_query_file
+        template "query.rb", File.join("app/queries", class_path, "#{file_name}_query.rb")
+      end
+
+      def create_query_definitions_file
+        template "query_definitions.rb", File.join("app/queries/definitions", class_path, "#{file_name}_query_definitions.rb")
+      end
+
+      def create_query_test_file
+        unless options[:skip_unit_test]
+          template "unit_test.rb", File.join("test/queries", class_path, "#{file_name}_query_test.rb")
+        end
+      end
+
+      private
+        def assign_names!(name)
+          super(name)
+          @method_options = options.slice("defines", "queries", "lambdas")
+          @query_methods = @method_options.map { |key, val| val }.flatten
+        end
+
+        def query_class_name
+          "#{file_name.camelize}Query"
+        end
+
+        def namespaced_query?
+          !class_path.empty?
+        end
+
+        def namespaced_names
+          class_path
+        end
+
+        def namespaced_content(content)
+          namespaced_names.reverse_each do |namespace_name|
+            content = "module #{namespace_name.camelize}\n#{indent(content)}\nend"
+          end
+          content
+        end
+
+        def module_namespacing(&block)
+          content = capture(&block)
+          content = namespaced_content(content) if namespaced_query?
+          concat(content)
+        end
+
+        def module_definitions_namespacing(&block)
+          content = capture(&block)
+          content = namespaced_content(content) if namespaced_query?
+          definitions_namespace_content = "module Definitions\n#{indent(content)}\nend"
+          concat(definitions_namespace_content)
+        end
+    end
+  end
+end

data/lib/rails/generators/query/templates/query.rb.tt

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+<% module_namespacing do -%>
+class <%= query_class_name %> < <%= "Db2Query::Base" -%>
+<% if @query_methods.empty? %>
+<%= indent("query :to_do, <<-SQL\n") %>
+<%= indent("SQL\n") %>
+<%= indent("def to_do_sql\n") %>
+<%= indent("end") %>
+<% end -%>
+<% @method_options.each do |key, val| -%>
+<% val.each_with_index do |option, index| -%>
+<% case key when 'defines' -%> 
+<%= indent("def #{option}_sql\n") %>
+<%= indent("end") %>
+<% when 'queries' %>
+<%= indent("query :#{option}, <<-SQL\n") %>
+<%= indent("SQL") %>
+<% when 'lambdas' %>
+<%= indent("query :#{option}, -> args {\n") %>
+<%= indent("}") %>
+<% end -%>
+<% end -%>
+<% end -%>
+<%= 'end' -%>
+<% end %>

data/lib/rails/generators/query/templates/query_definitions.rb.tt

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+<% module_definitions_namespacing do -%>
+class <%= query_class_name %>Definitions < <%= "Db2Query::Definitions" %>
+<% if @query_methods.empty? %>
+<%= indent("def describe\n") -%>
+<%= indent("") %>
+<%= indent("end") %>
+<% else %>
+<%= indent("def describe") -%>
+<% @query_methods.each do |method| %>
+  <%= indent("query_definition :#{method} do |c|\n") %>
+  <%= indent("end") %>
+<% end -%>
+<%= indent("end") %>
+<% end %>
+<%= 'end' -%>
+<% end %>

data/lib/rails/generators/query/templates/unit_test.rb.tt

@@ -0,0 +1,9 @@
+require "test_helper"
+
+<% module_namespacing do -%>
+class <%= query_class_name %>Test < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+<%= 'end' -%>
+<% 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.3
 platform: ruby
 authors:
 - yohanes_l
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-13 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-odbc
+  name: tty-progressbar
   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
   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-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: rubocop
+  name: rubocop-rails
   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: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,22 +109,37 @@ 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: 2.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.5
+- !ruby/object:Gem::Dependency
+  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: []
@@ -134,26 +149,49 @@ 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/db_client.rb
+- lib/db2_query/db_connection.rb
+- lib/db2_query/db_statements.rb
+- lib/db2_query/definitions.rb
 - lib/db2_query/error.rb
-- lib/db2_query/formatter.rb
-- lib/db2_query/odbc_connector.rb
+- lib/db2_query/field_type.rb
+- lib/db2_query/helper.rb
+- lib/db2_query/logger.rb
+- lib/db2_query/query.rb
 - lib/db2_query/railtie.rb
 - lib/db2_query/result.rb
+- lib/db2_query/sql_statement.rb
+- lib/db2_query/tasks.rb
 - lib/db2_query/tasks/database.rake
 - lib/db2_query/tasks/init.rake
 - lib/db2_query/tasks/initializer.rake
+- lib/db2_query/tasks/templates/database.rb.tt
+- lib/db2_query/tasks/templates/initializer.rb.tt
+- lib/db2_query/type/binary.rb
+- lib/db2_query/type/boolean.rb
+- lib/db2_query/type/date.rb
+- lib/db2_query/type/decimal.rb
+- lib/db2_query/type/integer.rb
+- lib/db2_query/type/string.rb
+- lib/db2_query/type/text.rb
+- lib/db2_query/type/time.rb
+- lib/db2_query/type/timestamp.rb
+- lib/db2_query/type/value.rb
 - lib/db2_query/version.rb
+- lib/rails/generators/query/USAGE
+- lib/rails/generators/query/query_generator.rb
+- lib/rails/generators/query/templates/query.rb.tt
+- lib/rails/generators/query/templates/query_definitions.rb.tt
+- lib/rails/generators/query/templates/unit_test.rb.tt
 homepage: https://github.com/yohaneslumentut/db2_query
 licenses:
 - MIT
 metadata:
-  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/yohaneslumentut/db2_query
+  source_code_uri: https://github.com/yohaneslumentut/db2_query
+  changelog_uri: https://github.com/yohaneslumentut/db2_query
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -172,5 +210,5 @@ requirements: []
 rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
-summary: DB2Query
+summary: Rails Db2 ODBC plugin
 test_files: []

data/lib/db2_query/bind.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module DB2Query
-  class Bind < Struct.new(:name, :value, :index)
-  end
-end