activerecord-cubrid2-adapter 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e8634b1c39dd11d4694db73f13bf36b5f94a3a976f9d326dbffc5ce8e9145c2
-  data.tar.gz: aad71acada082d9f3ddd1d7e339d4db8d6d6a7644824705daebed134d5c0f104
+  metadata.gz: '083943f215dc84e878a3d8d5d79c8b1a25703c1380ca2798c6e767205fcc792d'
+  data.tar.gz: 975804dda34c9ed0cc36ed5d37076ba0485cc0051b0fd08a9dbaa5079864d127
 SHA512:
-  metadata.gz: ec45cc833218ea9b5193fecbeb27a3aacb85795a7a4a5495fb53ec7f73f8ebeb71a4589e55625222c5c69fe5d9684a964b86d9081c0353fe88e4581d5713f095
-  data.tar.gz: 96882f548af718500348c060af3ab9563f04a504af3414304965e109abd7ab7896e442c815a7166c169298ae71eb62872bbb4d7f7e27d12a4267d26e572aca59
+  metadata.gz: 823ff2da41876111cb1cb3cce15171fcb9790536305658c7389e63f11447b7343f8f4dcd8aa771b804d927367be3b99361a5a1c4a2fc4dbb41388d39421c00a7
+  data.tar.gz: '08c0ae544747c7a8b2fae2ad44d07b64d8097c499113b3eff9baf77e78268783bd277c70fbf1767b7625d99f11f54710a847c7e209d1c6f5d2706ecb3157f53c'

data/README.md

@@ -1,6 +1,8 @@
 # activerecord-cubrid2-adapter
 Cubrid database connector for ruby, and active_record, depends on 'cubrid' gem
 
+[![Gem Version](https://badge.fury.io/rb/activerecord-cubrid2-adapter.svg)](https://badge.fury.io/rb/activerecord-cubrid2-adapter)
+
 DESCRIPTION
 -----------
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/lib/active_record/connection_adapters/abstract_cubrid2_adapter.rb

@@ -199,6 +199,8 @@ module ActiveRecord
         materialize_transactions
 
         stmt = nil
+
+        # pp "######### #{sql}"
         log(sql, name) do
           ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
             stmt = @connection.query(sql)
@@ -239,19 +241,32 @@ module ActiveRecord
 
       # SCHEMA STATEMENTS ========================================
 
-      # Drops the database: not supported now
-      def recreate_database(_name, _options = {})
-        raise 'In Cubrid create/drop database not supported'
+      # Recreate database
+      def recreate_database(name, options = {})
+        drop_database(name)
+        create_database(name, options)
       end
 
-      # Create a new Cubrid database: not supported now
-      def create_database(_name, _options = {})
-        raise 'In Cubrid create/drop database not supported'
+      # Create a new Cubrid database
+      # TODO: not workign with rake db:create 
+      def create_database(name, options = {})
+        options[:db_volume_size] ||= '20' # megabytes
+        options[:log_volume_size] ||= '20' # megabytes
+        options[:encoding] ||= 'en_US.utf8'
+
+        Kernel.exec 'cubrid createdb ' +
+             "--db-volume-size=#{options[:db_volume_size]}M " +
+             "--log-volume-size=#{options[:log_volume_size]}M #{name} " +
+             "#{options[:encoding]}"
+        
+        Kernel.exec "cubrid service start #{name}"
       end
 
-      # Drops a Cubrid database: not supported now
-      def drop_database(_name) # :nodoc:
-        raise 'In Cubrid create/drop database not supported'
+      # Drops a Cubrid database
+      # TODO: not workign with rake db:drop
+      def drop_database(name)
+        Kernel.exec "cubrid service stop #{name}"
+        Kernel.exec "cubrid deletedb #{name}"        
       end
 
       def current_database
@@ -462,18 +477,30 @@ module ActiveRecord
         prikeys
       end
 
-      def default_uniqueness_comparison(attribute, value, klass) # :nodoc:
-        column = column_for_attribute(attribute)
+      if ActiveRecord.version.to_s < '6.1.3.1'
+        def default_uniqueness_comparison(attribute, value, klass = nil) # :nodoc:
+          column = column_for_attribute(attribute)
 
-        if column.collation && !column.case_sensitive? && !value.nil?
-          ActiveSupport::Deprecation.warn(<<~MSG.squish)
-            Uniqueness validator will no longer enforce case sensitive comparison in Rails 6.1.
-            To continue case sensitive comparison on the :#{attribute.name} attribute in #{klass} model,
-            pass `case_sensitive: true` option explicitly to the uniqueness validator.
-          MSG
-          attribute.eq(Arel::Nodes::Bin.new(value))
-        else
-          super
+          if column.collation && !column.case_sensitive? && !value.nil?
+            ActiveSupport::Deprecation.warn(<<~MSG.squish)
+              Uniqueness validator will no longer enforce case sensitive comparison in Rails 6.1.
+              To continue case sensitive comparison on the :#{attribute.name} attribute in #{klass} model,
+              pass `case_sensitive: true` option explicitly to the uniqueness validator.
+            MSG
+            attribute.eq(Arel::Nodes::Bin.new(value))
+          else
+            super
+          end
+        end
+      else
+        def default_uniqueness_comparison(attribute, value) # :nodoc:
+          column = column_for_attribute(attribute)
+
+          if column.collation && !column.case_sensitive? && !value.nil?
+            attribute.eq(Arel::Nodes::Bin.new(value))
+          else
+            super
+          end
         end
       end
 

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

@@ -38,8 +38,7 @@ module ActiveRecord
           sql << quote_column_name(o.name)
           # sql << "USING #{o.using}" if o.using
           sql << "ON #{quote_table_name(o.table)}" if create
-          sql << "(#{quoted_columns(o)})"
-
+          sql << "(" + o.columns.map { |c| quote_column_name(c) }.join(', ') +")"
           add_sql_comment!(sql.join(' '), o.comment)
         end
 
@@ -95,7 +94,6 @@ module ActiveRecord
             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

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

@@ -55,7 +55,7 @@ module ActiveRecord
           indexes.map do |index|
             options = index.pop
 
-            if expressions = options.delete(:expressions)
+            if (expressions = options.delete(:expressions))
               orders = options.delete(:orders)
               lengths = options.delete(:lengths)
 
@@ -101,13 +101,13 @@ module ActiveRecord
         def type_to_sql(type, limit: nil,
                         precision: nil, scale: nil,
                         size: limit_to_size(limit, type),
-                        unsigned: nil, **)
+                        unsigned: nil, **options)
 
           case type.to_s
           when 'integer'
             integer_to_sql(limit)
           when 'serial'
-            integer_to_sql(8) #bigint
+            integer_to_sql(8) # bigint
           when 'float', 'real', 'double', 'double precision'
             float_to_sql(limit)
           when 'text', 'string', 'varchar', 'char varing'
@@ -118,6 +118,8 @@ module ActiveRecord
             type_with_size_to_sql('blob', size)
           when 'clob'
             type_with_size_to_sql('clob', size)
+          when 'boolean'
+            type_with_size_to_sql('boolean', size)
           when 'nchar', 'nchar varing'
             raise 'Not supported from cubrid 9.0'
           else
@@ -235,6 +237,8 @@ module ActiveRecord
             'blob'
           when 'clob'
             'clob'
+          when 'boolean'
+            'smallint'
           end
         end
 

data/lib/active_record/connection_adapters/cubrid2_adapter.rb

@@ -13,7 +13,7 @@ module ActiveRecord
       config = config.symbolize_keys
       config[:flags] ||= 0
 
-      client = Cubrid2::Client.new(config)
+      client = ::Cubrid2::Client.new(config)
       ConnectionAdapters::Cubrid2Adapter.new(client, logger, nil, config)
     rescue Cubrid2::Error => e
       raise ActiveRecord::NoDatabaseError if e.error_number == ER_DATABASE_CONNECTION_ERROR
@@ -145,7 +145,7 @@ module ActiveRecord
       private
 
       def connect
-        @connection = Cubrid2::Client.new(@config)
+        @connection = ::Cubrid2::Client.new(@config)
         configure_connection
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cubrid2-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Eui-Taik Na
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-27 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord