activerecord-cubrid2-adapter 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06a871f89134bc5f13e2905a30968756ade6e68f72d7c227e5b186e65d05cd3
-  data.tar.gz: c20757cde7ba8620d30f8a6f5803695a1492f1690470a6bc0f0c13b21a8af375
+  metadata.gz: 5a4def5956cfad3d9c280869241d377182f2007624ff1ba2e9c90eb2ea456423
+  data.tar.gz: 21f100c281de6bb731613f8c2846c222330bd1044fd8785ba48b35611a6658b9
 SHA512:
-  metadata.gz: e47475a4c8728ac72673f88abc60ab53179d6397d97930bf475f0b1005e0fe956ebed46ad5c16a16800bb4689d99626e074ba2136e4bff9e88c5a517f3f79da2
-  data.tar.gz: 92bb1744b6427c10c923db59486e26c1687df128a63af79d842add0a3eb94d478d4db3fa0de6f73603aa25af074e3d517e1200d5d42af4b0696bed5e5c386759
+  metadata.gz: 35f826c22d9adec406b63ef687ca5ac12757fe59ffa2a7ebb534cbfa3ad6e28a45f154adcb809d1181f537b055e6569b0bb53abc33c49b63c1bc4b3e4b476651
+  data.tar.gz: c64e3974cfd3f960fa12d3e1fd8c3348f41a976d1f3d8797544fc128f01f299edd1c1bedf00790e2b5f8ce20e06a19ec669590f060a5c9ce9eedad3e6fbf679b

data/.gitignore

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

data/README.md

@@ -4,24 +4,25 @@ Cubrid database connector for ruby, and active_record, depends on 'cubrid' gem
 DESCRIPTION
 -----------
 
-Cubrid2 ActiveRecord adapter privides Cubrid database from Ruby on Rails applications. Now works with Ruby on Rails 6.0 and it is working with Cubrid database versions 9.x to higher. 
-
-BUILD
-------------
-```ruby
-gem install rake-compiler
-rake build
-```
+Cubrid2 ActiveRecord adapter privides Cubrid database from Ruby on Rails applications. Now works with Ruby on Rails 6.0, 7.0 and it is working with Cubrid database versions 9.x to higher.
 
 INSTALLATION
 ------------
 
 ```ruby
 # Use cubrid as the database for Active Record
-gem 'cubrid' # cubrid interface gem, based on native CCI C interface 
+gem 'cubrid' # cubrid interface gem, based on native CCI C interface
+
+# OR use local build
+# git clone https://github.com/CUBRID/cubrid-ruby.git /opt/cubrid/cubrid-ruby
+# cd /opt/cubrid/cubrid-ruby
+# # goto directory and build cubrid-ruby
+
+# gem 'cubrid', path: '/opt/cubrid/cubrid-ruby'
+
 gem 'activerecord-cubrid2-adapter'
 ```
-Currently Rails <6.0, >=7.0, Windows, JRuby is not tested.
+Currently Rails Windows, JRuby is not tested.
 
 ### Without Rails and Bundler
 
@@ -31,9 +32,6 @@ If you want to use ActiveRecord and Cubrid2 adapter without Rails and Bundler th
 gem install activerecord-cubrid2-adapter
 ```
 
-USAGE
------
-
 ### Database connection
 
 In Rails application `config/database.yml` use 'cubrid2' as adapter name, e.g.
@@ -48,16 +46,27 @@ development:
 ```
 
 EXAMPLE
--------------
+-----
 
 Check test_activerecord.rb in the tests directory.
 
 
+BUILDING GEM
+-----
+
+```bash
+gem install rake-compiler
+rake build
+
+# OR
+
+gem build activerecord-cubrid2-adapter.gemspec
+```
+
 LINKS
 -----
 
-* Source code: https://github.com/damulhan/activerecord-cubrid2-adapter
-* Active Record – Object-relational mapping in Rails: https://github.com/rails/rails/tree/main/activerecord 
-* Cubrid Ruby GEM: https://github.com/CUBRID/cubrid-ruby 
+* Active Record – Object-relational mapping in Rails: https://github.com/rails/rails/tree/main/activerecord
+* Cubrid Ruby GEM: https://github.com/CUBRID/cubrid-ruby
 * Cubrid Homepage: https://www.cubrid.org
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

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', '>= 6.0'
+  spec.add_runtime_dependency 'cubrid', '~> 10.0', '>= 10.0'
 end

data/lib/active_record/connection_adapters/abstract_cubrid2_adapter.rb

@@ -144,7 +144,7 @@ module ActiveRecord
       end
 
       def index_algorithms
-        { }
+        {}
       end
 
       # HELPER METHODS ===========================================
@@ -176,10 +176,10 @@ module ActiveRecord
 
       # CONNECTION MANAGEMENT ====================================
 
-      def clear_cache! # :nodoc:
-        reload_type_map
-        super
-      end
+      # def clear_cache! # :nodoc:
+      #   reload_type_map
+      #   super
+      # end
 
       #--
       # DATABASE STATEMENTS ======================================
@@ -326,7 +326,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
@@ -351,11 +356,13 @@ module ActiveRecord
       end
 
       def change_column(table_name, column_name, type, options = {}) # :nodoc:
-        execute("ALTER TABLE #{quote_table_name(table_name)} #{change_column_for_alter(table_name, column_name, type, **options)}")
+        execute("ALTER TABLE #{quote_table_name(table_name)} #{change_column_for_alter(table_name, column_name, type,
+                                                                                       **options)}")
       end
 
       def rename_column(table_name, column_name, new_column_name) # :nodoc:
-        execute("ALTER TABLE #{quote_table_name(table_name)} #{rename_column_for_alter(table_name, column_name, new_column_name)}")
+        execute("ALTER TABLE #{quote_table_name(table_name)} #{rename_column_for_alter(table_name, column_name,
+                                                                                       new_column_name)}")
         rename_column_indexes(table_name, column_name, new_column_name)
       end
 
@@ -520,9 +527,9 @@ module ActiveRecord
       end
 
       def check_version # :nodoc:
-        if database_version < '9.0'
-          raise "Your version of Cubrid (#{database_version}) is too old. Active Record supports Cubrid >= 9.0."
-        end
+        return unless database_version < '9.0'
+
+        raise "Your version of Cubrid (#{database_version}) is too old. Active Record supports Cubrid >= 9.0."
       end
 
       private
@@ -650,14 +657,15 @@ module ActiveRecord
           comment: column.comment
         }
 
-        current_type = exec_query("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE #{quote(column_name)}", "SCHEMA").first["Type"]
+        current_type = exec_query("SHOW COLUMNS FROM #{quote_table_name(table_name)} LIKE #{quote(column_name)}",
+                                  'SCHEMA').first['Type']
         td = create_table_definition(table_name)
         cd = td.new_column_definition(new_column_name, current_type, **options)
         schema_creation.accept(ChangeColumnDefinition.new(cd, column.name))
       end
 
       def add_index_for_alter(table_name, column_name, **options)
-        index, algorithm, _ = add_index_options(table_name, column_name, **options)
+        index, algorithm, = add_index_options(table_name, column_name, **options)
         algorithm = ", #{algorithm}" if algorithm
 
         "ADD #{schema_creation.accept(index)}#{algorithm}"

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

@@ -43,9 +43,8 @@ module ActiveRecord
 
           # make sure we carry over any changes to ActiveRecord::Base.default_timezone that have been
           # made since we established the connection
-          @connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone
+          # @connection.query_options[:database_timezone] = ActiveRecord::Base.default_timezone
           # @connection.query_options[:database_timezone] = ActiveRecord.default_timezone
-
           super
         end
 
@@ -87,11 +86,11 @@ module ActiveRecord
         def _extract_rows_from_stmt__raw(stmt, as_hash: false)
           rows = []
           if as_hash
-            while row = stmt.fetch_hash
+            while (row = stmt.fetch_hash)
               rows << row
             end
           else
-            while row = stmt.fetch
+            while (row = stmt.fetch)
               rows << row
             end
           end
@@ -101,13 +100,13 @@ module ActiveRecord
         def _extract_rows_from_stmt__utf8(stmt, as_hash: false)
           rows = []
           if as_hash
-            while row = stmt.fetch_hash
+            while (row = stmt.fetch_hash)
               rows << row.map do |x|
                 [x[0], _as_utf8(x[1])]
               end.to_h
             end
           else
-            while row = stmt.fetch
+            while (row = stmt.fetch)
               rows << row.map { |x| _as_utf8(x) }
             end
           end
@@ -128,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_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
 

data/lib/cubrid2.rb

@@ -4,30 +4,30 @@ require 'bigdecimal'
 # Load libcubrid.dll before requiring cubrid/cubrid.so
 # This gives a chance to be flexible about the load path
 # Or to bomb out with a clear error message instead of a linker crash
-if RUBY_PLATFORM =~ /mswin|mingw/
-  dll_path = if ENV['RUBY_CUBRID_LIBCUBRID_DLL']
-               # If this environment variable is set, it overrides any other paths
-               # The user is advised to use backslashes not forward slashes
-               ENV['RUBY_CUBRID_LIBCUBRID_DLL']
-             elsif File.exist?(File.expand_path('../vendor/libcubrid.dll', File.dirname(__FILE__)))
-               # Use vendor/libcubrid.dll if it exists, convert slashes for Win32 LoadLibrary
-               File.expand_path('../vendor/libcubrid.dll', File.dirname(__FILE__))
-               # elsif defined?(RubyInstaller)
-               # RubyInstaller-2.4+ native build doesn't need DLL preloading
-               # else
-               # This will use default / system library paths
-               '../vendor/libcubrid.dll'
-             end
+# if RUBY_PLATFORM =~ /mswin|mingw/
+#   dll_path = if ENV['RUBY_CUBRID_LIBCUBRID_DLL']
+#                # If this environment variable is set, it overrides any other paths
+#                # The user is advised to use backslashes not forward slashes
+#                ENV['RUBY_CUBRID_LIBCUBRID_DLL']
+#              elsif File.exist?(File.expand_path('../vendor/libcubrid.dll', File.dirname(__FILE__)))
+#                # Use vendor/libcubrid.dll if it exists, convert slashes for Win32 LoadLibrary
+#                File.expand_path('../vendor/libcubrid.dll', File.dirname(__FILE__))
+#                # elsif defined?(RubyInstaller)
+#                # RubyInstaller-2.4+ native build doesn't need DLL preloading
+#                # else
+#                # This will use default / system library paths
+#                '../vendor/libcubrid.dll'
+#              end
 
-  if dll_path
-    require 'fiddle'
-    kernel32 = Fiddle.dlopen 'kernel32'
-    load_library = Fiddle::Function.new(
-      kernel32['LoadLibraryW'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT
-    )
-    abort "Failed to load libcubrid.dll from #{dll_path}" if load_library.call(dll_path.encode('utf-16le')).zero?
-  end
-end
+#   if dll_path
+#     require 'fiddle'
+#     kernel32 = Fiddle.dlopen 'kernel32'
+#     load_library = Fiddle::Function.new(
+#       kernel32['LoadLibraryW'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT
+#     )
+#     abort "Failed to load libcubrid.dll from #{dll_path}" if load_library.call(dll_path.encode('utf-16le')).zero?
+#   end
+# end
 
 # load c extension
 gem 'cubrid', '>= 10.0'

data/tests/Gemfile

@@ -1,10 +1,11 @@
 source 'https://rubygems.org'
 
-# I cloned from original cubrid-ruby git repository to test
-# git clone https://github.com/CUBRID/cubrid-ruby.git
-gem 'cubrid', path: '/opt/cubrid/cubrid-ruby'
-
-gem 'activerecord', '~> 6.0'
-gem 'activerecord-cubrid2-adapter', path: '../'
+gem 'activerecord', '~> 7.0'
 gem 'test-unit'
 
+# gem 'cubrid'
+gem 'cubrid', github: 'CUBRID/cubrid-ruby'
+# gem 'cubrid', path: '/opt/cubrid/cubrid-ruby'
+
+gem 'activerecord-cubrid2-adapter'
+# gem 'activerecord-cubrid2-adapter', path: '..'

data/tests/test_activerecord_output_example.txt

@@ -0,0 +1,61 @@
+Loaded suite test_activerecord
+Started
+### setup 
+-- activerecord-cubrid2-adapter version: 0.0.1
+-- cubrid server version: 11.2.2.0705
+-- charset: utf8
+-- collation: utf8_bin
+### test_benchmark_insert
+       user     system      total        real
+ 1th test
+inserted id: 1
+2th test
+inserted id: 2
+3th test
+inserted id: 3
+4th test
+inserted id: 4
+5th test
+inserted id: 5
+6th test
+inserted id: 6
+7th test
+inserted id: 7
+8th test
+inserted id: 8
+9th test
+inserted id: 9
+10th test
+inserted id: 10
+  0.014243   0.002685   0.016928 (  0.074481)
+### 10 rows inserted
+### teardown 
+.### setup 
+-- activerecord-cubrid2-adapter version: 0.0.1
+-- cubrid server version: 11.2.2.0705
+-- charset: utf8
+-- collation: utf8_bin
+### test_insert
+inserted id: 2
+inserted id: 3
+inserted id: 4
+#<CubridTest:0x00007fdced0cdbf0
+ id: 3,
+ name: "test2",
+ body: "한글2",
+ created_at: 2023-01-20 11:19:29 UTC,
+ updated_at: 2023-01-20 11:19:29 UTC>
+#<CubridTest:0x00007fdcf05901f8
+ id: 4,
+ name: "test3",
+ body: "中文3",
+ created_at: 2023-01-20 11:19:29 UTC,
+ updated_at: 2023-01-20 11:19:29 UTC>
+### teardown 
+.
+Finished in 0.266551841 seconds.
+-------------------------------------------------------------------------------
+2 tests, 5 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications
+100% passed
+-------------------------------------------------------------------------------
+7.50 tests/s, 18.76 assertions/s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cubrid2-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Eui-Taik Na
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-01-26 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: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,10 +27,16 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !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'
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
@@ -75,6 +87,7 @@ files:
 - lib/cubrid2/version.rb
 - tests/Gemfile
 - tests/test_activerecord.rb
+- tests/test_activerecord_output_example.txt
 homepage: https://github.com/damulhan/activerecord-cubrid2-adapter
 licenses:
 - MIT
@@ -95,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Cubrid Adapter.