ardm-do-adapter 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f38f8747b0bde45cd4b0003875124b33bbfbda7
-  data.tar.gz: 60395ab8432a9283b71f896acf170d5f3bf58063
+  metadata.gz: c82bd91805f6089e2010a5ce2b19fdc7d10d620f
+  data.tar.gz: 6a3737cdcd799f08b304d808efd0ede9792fb19a
 SHA512:
-  metadata.gz: 47a3826335e162e1dfcdee50eaacf4224b9ea8797835c7574c613566837dc2f41316ac130a45f57d8e193054017319692a87d065f0ccdd9614c3422f32c05500
-  data.tar.gz: c262903e1f1b63333ab0f04da7d7274e807fc7c877a9f014409c50340fd1c1f1796dbf9f29a07fe66f112e1bdfa2c42abffe39222191b87b34b3eb702dd50f55
+  metadata.gz: 90a587c722695538d67e414858d9c27dfa02055fe3df80c234b3a115ce47378fe26b0b4d22ca101f0e80992f61e442831a8bb86b5ba6bd038a3e1bf4c60547e5
+  data.tar.gz: da5713ace4d2fe7b8619b203042890dccf71446f45f320b166d0261a1f4d6a8871d1ae3c225d3ff888166cbf2f7f426898568dd37289860ec80d1a9625da555e

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/ar-dm'
-DM_VERSION     = '~> 1.2.0'
+DM_VERSION     = '~> 1.2'
 DO_VERSION     = '~> 0.10.6'
 CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 

data/README.md

@@ -0,0 +1,18 @@
+[![Gem Version](https://badge.fury.io/rb/ardm-do-adapter.png)][gem]
+[![Build Status](https://travis-ci.org/ar-dm/ardm-do-adapter.png?branch=master)][travis]
+[![Dependency Status](https://gemnasium.com/ar-dm/ardm-do-adapter.png?travis)][gemnasium]
+
+[gem]: https://rubygems.org/gems/ardm-do-adapter
+[travis]: https://travis-ci.org/ar-dm/ardm-do-adapter
+[gemnasium]: https://gemnasium.com/ar-dm/ardm-do-adapter
+
+# ardm-do-adapter
+
+A fork of [`dm-do-adapter`](https://github.com/datamapper/dm-do-adapter).
+
+## Install
+
+See [ardm-core](https://github.com/ar-dm/ardm-core) for more information.
+
+Unless they are specific to this gem, please ask general `ardm-` questions
+and open issues on `ardm-core`.

data/ardm-do-adapter.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  gem.extra_rdoc_files = %w[LICENSE README.rdoc]
+  gem.extra_rdoc_files = %w[LICENSE README.md]
   gem.require_paths = [ "lib" ]
 
   gem.add_runtime_dependency 'data_objects', '~> 0.10.6'

data/lib/dm-do-adapter/adapter.rb

@@ -310,19 +310,39 @@ module DataMapper
       # Adapter below.
       module SQL #:nodoc:
         IDENTIFIER_MAX_LENGTH = 128
+        QUESTION_MARK    = '?'.freeze
+        GT_OPERATOR      = '>'.freeze
+        LT_OPERATOR      = '<'.freeze
+        GTE_OPERATOR     = '>='.freeze
+        LTE_OPERATOR     = '<='.freeze
+        IS_OPERATOR      = 'IS'.freeze
+        EQ_OPERATOR      = '='.freeze
+        IN_OPERATOR      = 'IN'.freeze
+        BETWEEN_OPERATOR = 'BETWEEN'.freeze
+        REGEXP_OPERATOR  = '~'.freeze
+        LIKE_OPERATOR    = 'LIKE'.freeze
+        NULL_KEYWORD     = 'NULL'.freeze
+        AND_KEYWORD      = ' AND '.freeze
+        ON_KEYWORD       = 'ON'.freeze
+        COLUMN_SEPARATOR = ', '.freeze
+        SPACE            = ' '.freeze
+        ONE_EQ_ZERO      = '1 = 0'.freeze
+        SINGLE_QUOTE     = /"/.freeze
+        DOUBLE_QUOTE     = '""'.freeze
 
         # @api semipublic
         def property_to_column_name(property, qualify)
-          column_name = ''
+          column_name = quote_name(property.field)
 
           case qualify
-            when true
-              column_name << "#{quote_name(property.model.storage_name(name))}."
-            when String
-              column_name << "#{quote_name(qualify)}."
+          when true
+            "#{quote_name(property.model.storage_name(name))}.#{column_name}"
+          when String
+            "#{quote_name(qualify)}.#{column_name}"
+          else
+            column_name
           end
 
-          column_name << quote_name(property.field)
         end
 
         private
@@ -396,9 +416,9 @@ module DataMapper
             statement << default_values_clause
           else
             statement << DataMapper::Ext::String.compress_lines(<<-SQL)
-              (#{properties.map { |property| quote_name(property.field) }.join(', ')})
+              (#{properties.map { |property| quote_name(property.field) }.join(COLUMN_SEPARATOR)})
               VALUES
-              (#{(['?'] * properties.size).join(', ')})
+              (#{([QUESTION_MARK] * properties.size).join(COLUMN_SEPARATOR)})
             SQL
           end
 
@@ -438,7 +458,7 @@ module DataMapper
           end
 
           statement = "UPDATE #{quote_name(model.storage_name(name))}"
-          statement << " SET #{properties.map { |property| "#{quote_name(property.field)} = ?" }.join(', ')}"
+          statement << " SET #{properties.map { |property| "#{quote_name(property.field)} = ?" }.join(COLUMN_SEPARATOR)}"
           statement << " WHERE #{conditions_statement}" unless DataMapper::Ext.blank?(conditions_statement)
 
           return statement, bind_values
@@ -473,7 +493,7 @@ module DataMapper
         #
         # @api private
         def columns_statement(properties, qualify)
-          properties.map { |property| property_to_column_name(property, qualify) }.join(', ')
+          properties.map { |property| property_to_column_name(property, qualify) }.join(COLUMN_SEPARATOR)
         end
 
         # Constructs joins clause
@@ -504,7 +524,7 @@ module DataMapper
               seen[source_alias] = 0
             end
 
-            statements << 'ON'
+            statements << ON_KEYWORD
 
             add_join_conditions(relationship, target_alias, source_alias, statements)
             add_extra_join_conditions(relationship, target_alias, statements, join_bind_values)
@@ -513,13 +533,13 @@ module DataMapper
           # prepend the join bind values to the statement bind values
           bind_values.unshift(*join_bind_values)
 
-          statements.join(' ')
+          statements.join(SPACE)
         end
 
         def add_join_conditions(relationship, target_alias, source_alias, statements)
           statements << relationship.target_key.zip(relationship.source_key).map do |target_property, source_property|
             "#{property_to_column_name(target_property, target_alias)} = #{property_to_column_name(source_property, source_alias)}"
-          end.join(' AND ')
+          end.join(AND_KEYWORD)
         end
 
         def add_extra_join_conditions(relationship, target_alias, statements, bind_values)
@@ -575,10 +595,10 @@ module DataMapper
           statement = if target_key.size == 1
             property_to_column_name(target_key.first, qualify)
           else
-            "(#{target_key.map { |property| property_to_column_name(property, qualify) }.join(', ')})"
+            "(#{target_key.map { |property| property_to_column_name(property, qualify) }.join(COLUMN_SEPARATOR)})"
           end
 
-          statement << " IN (#{select_statement})"
+          statement = "#{statement} IN (#{select_statement})"
 
           return statement, bind_values
         end
@@ -592,7 +612,7 @@ module DataMapper
           if conditions.valid?
             conditions_statement(conditions, qualify)
           else
-            [ '1 = 0', [] ]
+            [ ONE_EQ_ZERO, [] ]
           end
         end
 
@@ -626,11 +646,11 @@ module DataMapper
         def order_statement(order, qualify)
           statements = order.map do |direction|
             statement = property_to_column_name(direction.target, qualify)
-            statement << ' DESC' if direction.operator == :desc
+            statement = "#{statement} DESC" if direction.operator == :desc
             statement
           end
 
-          statements.join(', ')
+          statements.join(COLUMN_SEPARATOR)
         end
 
         # @api private
@@ -699,10 +719,10 @@ module DataMapper
 
           # if operator return value contains ? then it means that it is function call
           # and it contains placeholder (%s) for property name as well (used in Oracle adapter for regexp operator)
-          if operator.include?('?')
+          if operator.include?(QUESTION_MARK)
             return operator % column_name, [ value ]
           else
-            return "#{column_name} #{operator} #{value.nil? ? 'NULL' : '?'}", [ value ].compact
+            return "#{column_name} #{operator} #{value.nil? ? NULL_KEYWORD : QUESTION_MARK}", [ value ].compact
           end
         end
 
@@ -715,39 +735,39 @@ module DataMapper
             when :in     then include_operator(subject, value)
             when :regexp then regexp_operator(value)
             when :like   then like_operator(value)
-            when :gt     then '>'
-            when :lt     then '<'
-            when :gte    then '>='
-            when :lte    then '<='
+            when :gt     then GT_OPERATOR
+            when :lt     then LT_OPERATOR
+            when :gte    then GTE_OPERATOR
+            when :lte    then LTE_OPERATOR
           end
         end
 
         # @api private
         def equality_operator(property, operand)
-          operand.nil? ? 'IS' : '='
+          operand.nil? ? IS_OPERATOR : EQ_OPERATOR
         end
 
         # @api private
         def include_operator(property, operand)
           case operand
-            when Array then 'IN'
-            when Range then 'BETWEEN'
+            when Array then IN_OPERATOR
+            when Range then BETWEEN_OPERATOR
           end
         end
 
         # @api private
         def regexp_operator(operand)
-          '~'
+          REGEXP_OPERATOR
         end
 
         # @api private
         def like_operator(operand)
-          'LIKE'
+          LIKE_OPERATOR
         end
 
         # @api private
         def quote_name(name)
-          "\"#{name[0, self.class::IDENTIFIER_MAX_LENGTH].gsub('"', '""')}\""
+          "\"#{name[0, self.class::IDENTIFIER_MAX_LENGTH].gsub(SINGLE_QUOTE,DOUBLE_QUOTE)}\""
         end
 
       end

data/lib/dm-do-adapter/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module DoAdapter
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ardm-do-adapter
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Martin Emde
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_objects
@@ -75,12 +75,12 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.rdoc
+- README.md
 files:
 - ".gitignore"
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - ardm-do-adapter.gemspec
 - lib/ardm-do-adapter.rb

data/README.rdoc

@@ -1,3 +0,0 @@
-= dm-do-adapter
-
-A DataObjects Adapter for DataMapper