activerecord-cubrid2-adapter 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a4def5956cfad3d9c280869241d377182f2007624ff1ba2e9c90eb2ea456423
-  data.tar.gz: 21f100c281de6bb731613f8c2846c222330bd1044fd8785ba48b35611a6658b9
+  metadata.gz: 9e8634b1c39dd11d4694db73f13bf36b5f94a3a976f9d326dbffc5ce8e9145c2
+  data.tar.gz: aad71acada082d9f3ddd1d7e339d4db8d6d6a7644824705daebed134d5c0f104
 SHA512:
-  metadata.gz: 35f826c22d9adec406b63ef687ca5ac12757fe59ffa2a7ebb534cbfa3ad6e28a45f154adcb809d1181f537b055e6569b0bb53abc33c49b63c1bc4b3e4b476651
-  data.tar.gz: c64e3974cfd3f960fa12d3e1fd8c3348f41a976d1f3d8797544fc128f01f299edd1c1bedf00790e2b5f8ce20e06a19ec669590f060a5c9ce9eedad3e6fbf679b
+  metadata.gz: ec45cc833218ea9b5193fecbeb27a3aacb85795a7a4a5495fb53ec7f73f8ebeb71a4589e55625222c5c69fe5d9684a964b86d9081c0353fe88e4581d5713f095
+  data.tar.gz: 96882f548af718500348c060af3ab9563f04a504af3414304965e109abd7ab7896e442c815a7166c169298ae71eb62872bbb4d7f7e27d12a4267d26e572aca59

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.5

data/activerecord-cubrid2-adapter.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'activerecord', '~> 6.0', '>= 6.0'
-  spec.add_runtime_dependency 'cubrid', '~> 10.0', '>= 10.0'
+  spec.add_runtime_dependency 'activerecord', '>= 6.0', '< 8'
+  spec.add_runtime_dependency 'cubrid', '>= 10.0'
 end

data/lib/active_record/connection_adapters/abstract_cubrid2_adapter.rb

@@ -199,7 +199,6 @@ module ActiveRecord
         materialize_transactions
 
         stmt = nil
-
         log(sql, name) do
           ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
             stmt = @connection.query(sql)
@@ -282,7 +281,7 @@ module ActiveRecord
           WHERE owner_name = 'PUBLIC'
             AND class_type = 'CLASS'
             AND is_system_class = 'NO'
-            AND class_name = #{quote_table_name(table_name)}
+            AND class_name = #{quote(table_name)}
         SQL
       end
 
@@ -547,6 +546,7 @@ module ActiveRecord
         register_integer_type m, /^bigint/i,    limit: 8
         register_integer_type m, /^int/i,       limit: 4
         register_integer_type m, /^smallint/i,  limit: 2
+        register_integer_type m, /^short/i, limit: 2
 
         m.register_type(/^smallint\(1\)/i, Type::Boolean.new) if emulate_booleans
         m.alias_type(/year/i,          'integer')

data/lib/active_record/connection_adapters/cubrid2/database_statements.rb

@@ -80,7 +80,10 @@ module ActiveRecord
         def _build_stmt_result(stmt)
           columns = stmt.column_info.map { |col| col['name'] }
           rows = is_conn_utf8? ? _extract_rows_from_stmt__utf8(stmt) : _extract_rows_from_stmt__raw(stmt)
-          build_result(columns: columns, rows: rows)
+
+          # build_result(columns: columns, rows: rows)
+          # for activerecord <= 6.0
+          ActiveRecord::Result.new(columns, rows, column_types = {})
         end
 
         def _extract_rows_from_stmt__raw(stmt, as_hash: false)

data/lib/active_record/connection_adapters/cubrid2/quoting.rb

@@ -4,6 +4,15 @@ module ActiveRecord
   module ConnectionAdapters
     module Cubrid2
       module Quoting # :nodoc:
+        def quote(value) # :nodoc:
+          case value
+          when ActiveRecord::ConnectionAdapters::ColumnDefinition
+            quote(value.name)
+          else
+            super
+          end
+        end
+
         # def quote_string(s)
         #   super
         # end
@@ -13,7 +22,7 @@ module ActiveRecord
         end
 
         def quote_table_name(name)
-          self.class.quoted_table_names[name] ||= super.gsub(".", "`.`").freeze
+          self.class.quoted_table_names[name] ||= super.gsub('.', '`.`').freeze
         end
 
         # def quote_table_name(name) # :nodoc:
@@ -32,11 +41,11 @@ module ActiveRecord
         end
 
         # Quotes column names for use in SQL queries.
-        #def quote_column_name(name) # :nodoc:
-          #self.class.quoted_column_names[name] ||= quote(super).freeze
-          #pp "## quote_column_name: #{name}"
-          #self.class.quoted_column_names[name] ||= quote_string(name).freeze
-        #end
+        # def quote_column_name(name) # :nodoc:
+        # self.class.quoted_column_names[name] ||= quote(super).freeze
+        # pp "## quote_column_name: #{name}"
+        # self.class.quoted_column_names[name] ||= quote_string(name).freeze
+        # end
 
         # def visit_Arel_Attributes_Attribute(o, collector)
         #   join_name = o.relation.table_alias || o.relation.name

data/lib/active_record/connection_adapters/cubrid2/schema_creation.rb

@@ -26,22 +26,21 @@ module ActiveRecord
         end
 
         def visit_CreateIndexDefinition(o)
-          sql = visit_IndexDefinition(o.index, true)
-          sql
+          visit_IndexDefinition(o.index, true)
         end
 
         def visit_IndexDefinition(o, create = false)
-          index_type = o.type&.to_s&.upcase || o.unique && "UNIQUE"
+          index_type = o.type&.to_s&.upcase || o.unique && 'UNIQUE'
 
-          sql = create ? ["CREATE"] : []
+          sql = create ? ['CREATE'] : []
           sql << index_type if index_type
-          sql << "INDEX"
+          sql << 'INDEX'
           sql << quote_column_name(o.name)
-          #sql << "USING #{o.using}" if o.using
+          # sql << "USING #{o.using}" if o.using
           sql << "ON #{quote_table_name(o.table)}" if create
           sql << "(#{quoted_columns(o)})"
 
-          add_sql_comment!(sql.join(" "), o.comment)
+          add_sql_comment!(sql.join(' '), o.comment)
         end
 
         def add_table_options!(create_sql, options)
@@ -57,15 +56,15 @@ module ActiveRecord
             sql << ' NULL'
           end
 
-          if charset = options[:charset]
+          if (charset = options[:charset])
             sql << " CHARSET #{charset}"
           end
 
-          if collation = options[:collation]
+          if (collation = options[:collation])
             sql << " COLLATE #{collation}"
           end
 
-          if as = options[:as]
+          if (as = options[:as])
             sql << " AS (#{as})"
           end
 
@@ -83,14 +82,21 @@ module ActiveRecord
         end
 
         def index_in_create(table_name, column_name, options)
-          index_def, algorithm, if_not_exists = @conn.add_index_options(table_name, column_name, **options)
-          index_name = index_def.name
-          index_columns = index_def.columns.map { |x| quote_column_name(x) }.join(', ')
-          index_type = index_def.unique ? 'UNIQUE' : ''
-          comment = index_def.comment
-          add_sql_comment!(
-            +"#{index_type} INDEX #{quote_column_name(index_name)} (#{index_columns})", comment
-          )
+          if ActiveRecord.version.to_s >= '6.1.0'
+            # for activerecord >= 6.1
+            index_def, algorithm, if_not_exists = @conn.add_index_options(table_name, column_name, **options)
+
+            index_name = index_def.name
+            index_columns = index_def.columns.map { |x| quote_column_name(x) }.join(', ')
+            index_type = index_def.unique ? 'UNIQUE' : ''
+            comment = index_def.comment
+          else
+            # for activerecord == 6.0
+            index_name, index_type, index_columns, _, _, index_using, comment =
+                                                        @conn.add_index_options(table_name, column_name, **options)
+          end
+
+          add_sql_comment!(+"#{index_type} INDEX #{quote_column_name(index_name)} (#{index_columns})", comment)
         end
       end
     end

metadata

@@ -1,42 +1,39 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cubrid2-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Eui-Taik Na
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: cubrid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
@@ -44,9 +41,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
@@ -108,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Cubrid Adapter.