db2_query 0.3.2 → 0.3.6

data/lib/db2_query/error.rb

@@ -39,7 +39,7 @@ module Db2Query
     end
   end
 
-  class ExtentionError < StandardError
+  class ExtensionError < StandardError
   end
 
   class ImplementationError < StandardError
@@ -78,4 +78,16 @@ module Db2Query
       "The query body needs to be callable or is a SQL statement string"
     end
   end
+
+  class QueryArgumentError < StandardError
+    def initialize(query_name, arg_key)
+      @query_name = query_name
+      @arg_key = arg_key
+      super(message)
+    end
+
+    def message
+      "Data type of `#{@arg_key}` not found at `:#{@query_name}` query definitions"
+    end
+  end
 end

data/lib/db2_query/helper.rb

@@ -16,12 +16,13 @@ module Db2Query
         sql.gsub("@list", "'#{list.join("', '")}'")
       end
 
-      def sql_with_extention(sql, extention)
-        if sql.scan(/\@extention+/).length == 0
-          raise Db2Query::ExtentionError, "Missing @extention pointer at SQL"
+      def sql_with_extension(sql, extension)
+        if sql.scan(/\@extension+/).length == 0
+          raise Db2Query::ExtensionError, "Missing @extension pointer at SQL"
         end
-        sql.gsub("@extention", extention.strip)
+        sql.gsub("@extension", extension.strip)
       end
+      alias sql_with_extention sql_with_extension
 
       private
         def sql_query_methods
@@ -42,7 +43,7 @@ module Db2Query
         end
 
         def fetch_error_message
-          "`fetch`, `fetch_list` and `fetch_extention` methods applied for SQL `select` statement only."
+          "`fetch`, `fetch_list` and `fetch_extension` methods applied for SQL `select` statement only."
         end
     end
   end

data/lib/db2_query/logger.rb

@@ -22,7 +22,7 @@ module Db2Query
         statement_name:    nil,
         connection_id:     object_id,
         connection:        self) do
-        synchronize do
+        mutex.synchronize do
           yield
         end
       rescue => e

data/lib/db2_query/query.rb

@@ -2,7 +2,7 @@
 
 module Db2Query
   class Query
-    attr_reader :columns, :keys, :query_name, :sql, :types
+    attr_reader :query_name, :sql, :columns, :keys, :types, :argument_types
 
     include SqlStatement
 
@@ -10,12 +10,16 @@ module Db2Query
       @columns = {}
       @query_name = query_name
       @sql_statement = nil
+      @argument_types = {}
       @types = {}
     end
 
-    def define_sql(sql)
-      @keys ||= new_keys(sql)
-      @sql ||= sql.tr("$", "")
+    def define_sql(raw_sql)
+      @keys = []
+      @sql = raw_sql.gsub(/:\w+/) do |match|
+        @keys << match[1..]
+        '?'
+      end
     end
 
     def map_column(name, args)
@@ -33,6 +37,19 @@ module Db2Query
       raise Db2Query::Error, "No column #{column} found at query: #{query_name} definitions"
     end
 
+    def argument_type(key)
+      argument_types.fetch(key) || data_type(key)
+    rescue
+      raise Db2Query::Error, "No argument #{key} type found at query: #{query_name}"
+    end
+
+    def argument_keys
+      keys.map do |key|
+        arg_key = "#{key}".split(".").last
+        arg_key.to_sym unless arg_key.nil?  
+      end
+    end
+
     def length
       columns.length
     end
@@ -52,7 +69,7 @@ module Db2Query
     end
 
     def sorted_args(args)
-      keys.map.with_index do |key, index|
+      argument_keys.map.with_index do |key, index|
         serialized_arg(args.is_a?(Hash) ? args[key] : args[index], key)
       end
     end
@@ -82,12 +99,12 @@ module Db2Query
     end
 
     private
-      def new_keys(raw_sql)
-        raw_sql.scan(/\$\S+/).map { |key| key.gsub!(/[$=,)]/, "").to_sym }
-      end
+      # def sql_arguments(raw_sql)
+      #   raw_sql.scan(/\$\S+/).map { |arg| arg.gsub!(/[$=,)]/, "").to_sym }
+      # end
 
       def serialized_arg(arg, key)
-        query_name.nil? ? arg : data_type(key).serialize(arg)
+        query_name.nil? ? arg : argument_type(key).serialize(arg)
       end
 
       def column_from_key(key)
@@ -104,14 +121,11 @@ module Db2Query
         end
       end
 
-      def validate_arguments(given, expected)
-        raise Db2Query::ArgumentError.new(given, expected) unless given == expected
-      end
-
       def validated_args(args)
-        args = args.first.is_a?(Hash) ? args.first : args
-        validate_arguments(args.length, keys.length)
-        sorted_args(args)
+        arguments = args.first.is_a?(Hash) ? args.first : args
+        given, expected = [arguments.length, keys.length]
+        raise Db2Query::ArgumentError.new(given, expected) unless given == expected
+        sorted_args(arguments)
       end
   end
 end

data/lib/db2_query/railtie.rb

@@ -1,18 +1,4 @@
-# frozen_string_literal: true
-
-require "db2_query"
-require "rails"
-
 module Db2Query
   class Railtie < ::Rails::Railtie
-    railtie_name :db2_query
-
-    rake_tasks do
-      Dir.glob("#{Db2Query.root}/db2_query/tasks/*.rake").each { |f| load f }
-    end
-
-    config.app_generators do
-      require "#{Db2Query.root}/rails/generators/query/query_generator.rb"
-    end
   end
 end

data/lib/db2_query/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Db2Query
-  VERSION = "0.3.2"
+  VERSION = "0.3.6"
 end

data/lib/db2_query.rb

@@ -1,14 +1,11 @@
-# frozen_string_literal: true
-
-require "active_record"
-require "active_support"
-require "active_support/concurrency/load_interlock_aware_monitor"
-require "active_model/type"
+require "db2_query/version"
+require "db2_query/railtie"
 require "connection_pool"
 require "odbc_utf8"
 require "db2_query/error"
 
 module Db2Query
+  # Your code goes here...
   autoload :Version, "db2_query/version"
   autoload :Error, "db2_query/error"
   autoload :Config, "db2_query/config"
@@ -44,6 +41,4 @@ module Db2Query
   def self.root
     __dir__
   end
-
-  require "db2_query/railtie" if defined?(Rails)
 end

data/lib/tasks/db2_query_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :db2_query do
+#   # Task goes here
+# end

metadata

@@ -1,125 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: db2_query
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.6
 platform: ruby
 authors:
-- yohanes_l
+- Yohanes Lumentut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: tty-progressbar
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 7.1.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+        version: '7.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.1.2
 - !ruby/object:Gem::Dependency
-  name: rubocop-rails
+  name: tty-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   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
@@ -136,8 +86,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Rails 5 & Rails 6 plugin for handling Db2 SQL SIUD statement (SELECT,
-  INSERT, UPDATE, DELETE) by using ODBC connection.
+description: A Rails 7 (Ruby v3.1.0) plugin for connecting Db2 with Rails appplication
+  by using ODBC connection.
 email:
 - yohanes.lumentut@gmail.com
 executables: []
@@ -160,16 +110,10 @@ files:
 - lib/db2_query/helper.rb
 - lib/db2_query/logger.rb
 - lib/db2_query/query.rb
-- lib/db2_query/quoting.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
@@ -181,11 +125,7 @@ files:
 - 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
+- lib/tasks/db2_query_tasks.rake
 homepage: https://github.com/yohaneslumentut/db2_query
 licenses:
 - MIT
@@ -208,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Rails Db2 ODBC plugin

data/lib/db2_query/quoting.rb

@@ -1,102 +0,0 @@
-# frozen_string_literal: true
-
-module Db2Query
-  module Quoting
-    def self.included(base)
-      base.send(:extend, ClassMethods)
-    end
-
-    module ClassMethods
-      def quoted_true
-        "TRUE"
-      end
-
-      def unquoted_true
-        1
-      end
-
-      def quoted_false
-        "FALSE"
-      end
-
-      def unquoted_false
-        0
-      end
-
-      def quoted_binary(value)
-        "x'#{value.hex}'"
-      end
-
-      def quoted_time(value)
-        value = value.change(year: 2000, month: 1, day: 1)
-        quoted_date(value).sub(/\A\d\d\d\d-\d\d-\d\d /, "")
-      end
-
-      def quoted_date(value)
-        if value.acts_like?(:time)
-          if ActiveRecord::Base.default_timezone == :utc
-            value = value.getutc if !value.utc?
-          else
-            value = value.getlocal
-          end
-        end
-
-        result = value.to_s(:db)
-        if value.respond_to?(:usec) && value.usec > 0
-          result << "." << sprintf("%06d", value.usec)
-        else
-          result
-        end
-      end
-
-      private
-        def _quote(value)
-          case value
-          when String, Symbol, ActiveSupport::Multibyte::Chars
-            "'#{quote_string(value.to_s)}'"
-          when true
-            quoted_true
-          when false
-            quoted_false
-          when nil
-            "NULL"
-          when BigDecimal
-            value.to_s("F")
-          when Numeric, ActiveSupport::Duration
-            value.to_s
-          when Db2Query::Type::Binary::Data
-            quoted_binary(value)
-          when ActiveRecord::Type::Time::Value
-            "'#{quoted_time(value)}'"
-          when Date, Time
-            "'#{quoted_date(value)}'"
-          when Class
-            "'#{value}'"
-          else raise TypeError, "can't quote #{value.class.name}"
-          end
-        end
-
-        def _type_cast(value)
-          case value
-          when Symbol, ActiveSupport::Multibyte::Chars
-            value.to_s
-          when Db2Query::Type::Binary::Data
-            value.hex
-          when true
-            unquoted_true
-          when false
-            unquoted_false
-          when BigDecimal
-            value.to_s("F")
-          when nil, Numeric, String
-            value
-          when ActiveRecord::Type::Time::Value
-            quoted_time(value)
-          when Date, Time
-            quoted_date(value)
-          else raise TypeError, "can't cast #{value.class.name}"
-          end
-        end
-    end
-  end
-end

data/lib/db2_query/tasks/database.rake

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "db2_query/tasks"
-
-namespace :db2query do
-  desc "Create Database configuration file"
-  task :database do
-    Db2Query::DatabaseTask.generate_file
-  end
-end

data/lib/db2_query/tasks/init.rake

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-namespace :db2query do
-  desc "Create Initializer and Database configuration file"
-  task :init do
-    Rake::Task["db2query:database"].invoke
-    Rake::Task["db2query:initializer"].invoke
-  end
-end

data/lib/db2_query/tasks/initializer.rake

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "db2_query/tasks"
-
-namespace :db2query do
-  desc "Create Initializer file"
-  task :initializer do
-    Db2Query::InitializerTask.generate_file
-  end
-end

data/lib/db2_query/tasks/templates/database.rb.tt

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-development:
-  dsn: TODO
-  idle: 5
-  pool: 5
-  timeout: 5
-
-test:
-  dsn: TODO
-  idle: 5
-  pool: 5
-  timeout: 5
-
-production:
-  dsn: TODO
-  idle: 5
-  pool: 5
-  timeout: 5

data/lib/db2_query/tasks/templates/initializer.rb.tt

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "db2_query"
-
-Db2Query::Base.initiation do |base|
-  base.set_field_types
-  base.establish_connection
-end

data/lib/rails/generators/query/USAGE

@@ -1,15 +0,0 @@
-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

@@ -1,70 +0,0 @@
-# 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