sbf-dm-do-adapter 1.4.0.beta.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd3e74ec3df7300824ef62244a7ddb5cdef5f81666ada57c9e87c73a2ff1b56
-  data.tar.gz: c20298b288433ca4d2f8ba217c8aa7174a8360f051ae3e3a5d48b228712bec50
+  metadata.gz: 16a04bde325413ace3bc643766937bc5289e7607fc1b1ef75453a7bb8265c37b
+  data.tar.gz: a73e33316d89daed37f90c15421d5f662cac23d8c7e6ed2f834a57c1aceb958c
 SHA512:
-  metadata.gz: 91aa518b9e8a8f8e674352e65e8d84f6252df5aca63deefa5bfaf40757e4c580670f7d76d4fc54c2400df99781b24a19b1e14cf1dc1c17f5e17b5c4f955c4801
-  data.tar.gz: 65653f2dd72e5980c693906057c0db540d9b760ad430f0173701f86cb31e33abb65712c47da39c425fb567e67ef64e17d8694b3e2656fd934483f38ddccdb116
+  metadata.gz: 3420ce790fd8c93c2718cf65ad73c4df1b00a44237d150b24c9ad5800f2e7ec7fbf455a77872196d967184f33cda1c79233db2075550911118a1f9a7d7fd3bbf
+  data.tar.gz: 9756624b873d2e32e4166597a05edcba3153bca2908d606965554aab2410b5b2678bceee4251e4e59aa89aa89b1a987795fbb60725f3f94c87e42364a9ef11ef

data/dm-do-adapter.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = DataMapper::DoAdapter::VERSION
   gem.required_ruby_version = '>= 2.7.8'
 
-  gem.add_runtime_dependency('sbf-data_objects', ['~> 0.11.0'])
-  gem.add_runtime_dependency('sbf-dm-core', ['~> 1.3.0'])
+  gem.add_runtime_dependency('sbf-data_objects', ['~> 0.11'])
+  gem.add_runtime_dependency('sbf-dm-core', ['~> 1.3'])
 end

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

@@ -14,7 +14,6 @@ module DataMapper
     class DataObjectsAdapter < AbstractAdapter
       extend Chainable
       extend Deprecate
-      include SQL
 
       SQL_FALSE = '1 = 0'.freeze
 
@@ -315,13 +314,13 @@ module DataMapper
         IDENTIFIER_MAX_LENGTH = 128
 
         # @api semipublic
-        def self.property_to_column_name(property, qualify)
+        def property_to_column_name(property, qualify)
           column_name = ''
 
           case qualify
-            when true
+          when true
               column_name << "#{quote_name(property.model.storage_name(name))}."
-            when String
+          when String
               column_name << "#{quote_name(qualify)}."
           end
 
@@ -334,7 +333,7 @@ module DataMapper
         # should overwrite this to return true.
         #
         # @api private
-        def self.supports_returning?
+        def supports_returning?
           false
         end
 
@@ -342,7 +341,7 @@ module DataMapper
         # INSERT statements should overwrite this to return false.
         #
         # @api private
-        def self.supports_default_values?
+        def supports_default_values?
           true
         end
 
@@ -351,7 +350,7 @@ module DataMapper
         # @return [String] SELECT statement as a string
         #
         # @api private
-        def self.select_statement(query)
+        def select_statement(query)
           qualify  = query.links.any?
           fields   = query.fields
           order_by = query.order
@@ -375,7 +374,7 @@ module DataMapper
 
         # default construction of LIMIT and OFFSET
         # overriden by some adapters (currently Oracle and SQL Server)
-        def self.add_limit_offset!(statement, limit, offset, bind_values)
+        def add_limit_offset!(statement, limit, offset, bind_values)
           if limit
             statement   << ' LIMIT ?'
             bind_values << limit
@@ -392,7 +391,7 @@ module DataMapper
         # @return [String] INSERT statement as a string
         #
         # @api private
-        def self.insert_statement(model, properties, serial)
+        def insert_statement(model, properties, serial)
           statement = "INSERT INTO #{quote_name(model.storage_name(name))} "
 
           if supports_default_values? && properties.empty?
@@ -414,13 +413,13 @@ module DataMapper
 
         # by default PostgreSQL syntax
         # overrided in Oracle adapter
-        def self.default_values_clause
+        def default_values_clause
           'DEFAULT VALUES'
         end
 
         # by default PostgreSQL syntax
         # overrided in Oracle adapter
-        def self.returning_clause(serial)
+        def returning_clause(serial)
           " RETURNING #{quote_name(serial.field)}"
         end
 
@@ -429,7 +428,7 @@ module DataMapper
         # @return [String] UPDATE statement as a string
         #
         # @api private
-        def self.update_statement(properties, query)
+        def update_statement(properties, query)
           model = query.model
           name  = self.name
 
@@ -452,7 +451,7 @@ module DataMapper
         # @return [String] DELETE statement as a string
         #
         # @api private
-        def self.delete_statement(query)
+        def delete_statement(query)
           model = query.model
           name  = self.name
 
@@ -475,8 +474,8 @@ module DataMapper
         #   list of fields as a string
         #
         # @api private
-        def self.columns_statement(properties, qualify)
-          properties.map { |property| property_to_column_name(property, qualify) }.join(', ')
+        def columns_statement(properties, qualify)
+          properties.map { |property| chainable_property_to_column_name(property, qualify) }.join(', ')
         end
 
         # Constructs joins clause
@@ -485,7 +484,7 @@ module DataMapper
         #   joins clause
         #
         # @api private
-        def self.join_statement(query, bind_values, qualify)
+        def join_statement(query, bind_values, qualify)
           statements       = []
           join_bind_values = []
 
@@ -519,13 +518,13 @@ module DataMapper
           statements.join(' ')
         end
 
-        def self.add_join_conditions(relationship, target_alias, source_alias, statements)
+        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
 
-        def self.add_extra_join_conditions(relationship, target_alias, statements, bind_values)
+        def add_extra_join_conditions(relationship, target_alias, statements, bind_values)
           conditions = DataMapper.repository(name).scope do
             relationship.target_model.all(relationship.query).query.conditions
           end
@@ -543,7 +542,7 @@ module DataMapper
         #   where clause
         #
         # @api private
-        def self.conditions_statement(conditions, qualify = false)
+        def conditions_statement(conditions, qualify = false)
           case conditions
             when Query::Conditions::NotOperation       then negate_operation(conditions.operand, qualify)
             when Query::Conditions::AbstractOperation  then operation_statement(conditions, qualify)
@@ -555,12 +554,12 @@ module DataMapper
         end
 
         # @api private
-        def self.supports_subquery?(*)
+        def supports_subquery?(*)
           true
         end
 
         # @api private
-        def self.subquery(query, subject, qualify)
+        def subquery(query, subject, qualify)
           source_key, target_key = subquery_keys(subject)
 
           if query.repository.name == name && supports_subquery?(query, source_key, target_key, qualify)
@@ -571,7 +570,7 @@ module DataMapper
         end
 
         # @api private
-        def self.subquery_statement(query, source_key, target_key, qualify)
+        def subquery_statement(query, source_key, target_key, qualify)
           query = subquery_query(query, source_key)
           select_statement, bind_values = select_statement(query)
 
@@ -587,7 +586,7 @@ module DataMapper
         end
 
         # @api private
-        def self.subquery_execute(query, source_key, target_key, qualify)
+        def subquery_execute(query, source_key, target_key, qualify)
           query      = subquery_query(query, source_key)
           sources    = query.model.all(query)
           conditions = Query.target_conditions(sources, source_key, target_key)
@@ -600,7 +599,7 @@ module DataMapper
         end
 
         # @api private
-        def self.subquery_keys(subject)
+        def subquery_keys(subject)
           case subject
             when Associations::Relationship
               relationship = subject.inverse
@@ -611,7 +610,7 @@ module DataMapper
         end
 
         # @api private
-        def self.subquery_query(query, source_key)
+        def subquery_query(query, source_key)
           # force unique to be false because PostgreSQL has a problem with
           # subselects that contain a GROUP BY with different columns
           # than the outer-most query
@@ -626,7 +625,7 @@ module DataMapper
         #   order clause
         #
         # @api private
-        def self.order_statement(order, qualify)
+        def order_statement(order, qualify)
           statements = order.map do |direction|
             statement = property_to_column_name(direction.target, qualify)
             statement << ' DESC' if direction.operator == :desc
@@ -637,14 +636,14 @@ module DataMapper
         end
 
         # @api private
-        def self.negate_operation(operand, qualify)
+        def negate_operation(operand, qualify)
           statement, bind_values = conditions_statement(operand, qualify)
           statement = "NOT(#{statement})" unless statement.nil?
           [ statement, bind_values ]
         end
 
         # @api private
-        def self.operation_statement(operation, qualify)
+        def operation_statement(operation, qualify)
           statements  = []
           bind_values = []
 
@@ -670,7 +669,7 @@ module DataMapper
         #   comparison clause
         #
         # @api private
-        def self.comparison_statement(comparison, qualify)
+        def comparison_statement(comparison, qualify)
           subject = comparison.subject
           value   = comparison.value
 
@@ -743,7 +742,7 @@ module DataMapper
           end
         end
 
-        def self.comparison_operator(comparison)
+        def comparison_operator(comparison)
           subject = comparison.subject
           value   = comparison.value
 
@@ -760,12 +759,12 @@ module DataMapper
         end
 
         # @api private
-        def self.equality_operator(property, operand)
+        def equality_operator(property, operand)
           operand.nil? ? 'IS' : '='
         end
 
         # @api private
-        def self.include_operator(property, operand)
+        def include_operator(property, operand)
           case operand
             when Array then 'IN'
             when Range then 'BETWEEN'
@@ -773,20 +772,24 @@ module DataMapper
         end
 
         # @api private
-        def self.regexp_operator(operand)
+        def regexp_operator(operand)
           '~'
         end
 
         # @api private
-        def self.like_operator(operand)
+        def like_operator(operand)
           'LIKE'
         end
 
         # @api private
-        def self.quote_name(name)
+        def quote_name(name)
           "\"#{name[0, self.class::IDENTIFIER_MAX_LENGTH].gsub('"', '""')}\""
         end
+
       end
+
+      include SQL
+
     end
 
     const_added(:DataObjectsAdapter)

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

@@ -1,5 +1,5 @@
 module DataMapper
   module DoAdapter
-    VERSION = '1.4.0.beta.1'
+    VERSION = '1.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sbf-dm-do-adapter
 version: !ruby/object:Gem::Version
-  version: 1.4.0.beta.1
+  version: 1.4.0
 platform: ruby
 authors:
 - opensource_firespring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sbf-data_objects
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: sbf-dm-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 description: A unified Ruby API for popular databases.
 email:
 - opensource@firespring.com
@@ -76,9 +76,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.8
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.10
 signing_key: