activerecord-cubrid2-adapter 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9bb76dd730abb53dfc4a0dd0eed73aae65807102e0785f0f745e251b62a09f
-  data.tar.gz: 2584cfda25294f6534eebe581f37d6c87ef3fd3cafb08bb7bda5029ecf86d110
+  metadata.gz: 66a82d90a133133ed00cd25820b12a40df63021603d080cf1670e9d440b20e78
+  data.tar.gz: 22a8b40fa849ed6bba01660a850a6603b1914e183357367d3d44f60f13862a13
 SHA512:
-  metadata.gz: cbcec064f78631b61d99e198e99cd4c969a5933b4266b184597c9904daa2e5955ad45568a277a803f0a7285a9d4c08d972a64b7a66e67eac610951061d230bd3
-  data.tar.gz: 8f56f4cf68b369bf042bb0be92d818882b3764d283a63de6d50ec6ad524bab14b12ba67a5349e9c149ed73df9a2e6b08bf371a408efb75906f27f10edead70a8
+  metadata.gz: 8e52dd2b5fb04ac6da7b6dd34cf251a0fecfeb415e1675f1979316eee291f3570579bfeb624a00eaead3184af9b79bf5a4d46bd4bf2a1e813ba11a5887312007
+  data.tar.gz: 07d2b7cbdde814f729cbf8e2559bb1797985f844f5598eb5bbc85cfffad8f9546bf991f70afd4ae07d841c78cbf59d602e22657421f9da4acfa4b7efb51931c0

data/.gitignore

@@ -17,3 +17,4 @@ tests/test_cubrid3.rb
 tests/test_mysql.rb
 tests/test_pg.rb
 
+activerecord-cubrid2-adapter-*.gem

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

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_dependency 'activerecord', '>= 6.0'
-  spec.add_dependency 'cubrid', '>= 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
 
@@ -326,7 +325,12 @@ module ActiveRecord
         if supports_rename_index?
           validate_index_length!(table_name, new_name)
 
-          execute "ALTER TABLE #{quote_table_name(table_name)} RENAME INDEX #{quote_table_name(old_name)} TO #{quote_table_name(new_name)}"
+          # NOTE: Renaming table index SQL would not work.
+          # See: https://www.cubrid.org/manual/ko/10.2/sql/schema/index_stmt.html#alter-index
+          #      https://www.cubrid.com/index.php?mid=qna&document_srl=3802148
+          _query = "ALTER INDEX #{quote_table_name(old_name)} ON #{quote_table_name(table_name)} RENAME TO #{quote_table_name(new_name)}"
+          puts "Warning: renaming index not work as manual. Ignoring: #{_query}"
+          # execute _query
         else
           super
         end
@@ -542,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

@@ -127,7 +127,8 @@ module ActiveRecord
         end
 
         def execute_batch(statements, name = nil)
-          combine_multi_statements(statements).each do |statement|
+          # ss = combine_multi_statements(statements)
+          statements.each do |statement|
             execute(statement, name)
           end
         end

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_adapter.rb

@@ -16,11 +16,9 @@ module ActiveRecord
       client = Cubrid2::Client.new(config)
       ConnectionAdapters::Cubrid2Adapter.new(client, logger, nil, config)
     rescue Cubrid2::Error => e
-      if e.error_number == ER_DATABASE_CONNECTION_ERROR
-        raise ActiveRecord::NoDatabaseError
-      else
-        raise
-      end
+      raise ActiveRecord::NoDatabaseError if e.error_number == ER_DATABASE_CONNECTION_ERROR
+
+      raise
     end
   end
 
@@ -72,7 +70,7 @@ module ActiveRecord
         stmt = result.is_a?(Array) ? result.first : result
         if block_given?
           if result && stmt
-            while row = stmt.fetch_hash
+            while (row = stmt.fetch_hash)
               yield row.symbolize_keys
             end
           end
@@ -92,8 +90,7 @@ module ActiveRecord
       def quote_string(string)
         # escaping with backslash is only allowed when 'no_backslash_escapes' == 'yes' in cubrid config, default is yes.
         # See: https://www.cubrid.org/manual/ko/11.2/sql/literal.html#id5
-        # "'#{string.gsub("'", "''")}'"
-        string
+        "#{string.gsub("'", "''")}"
       end
 
       #--
@@ -120,7 +117,7 @@ module ActiveRecord
 
       def discard! # :nodoc:
         super
-        #@connection.automatic_close = false
+        # @connection.automatic_close = false
         @connection = nil
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cubrid2-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 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
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: cubrid
   requirement: !ruby/object:Gem::Requirement
@@ -96,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.