activerecord-cubrid2-adapter 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a82d90a133133ed00cd25820b12a40df63021603d080cf1670e9d440b20e78
-  data.tar.gz: 22a8b40fa849ed6bba01660a850a6603b1914e183357367d3d44f60f13862a13
+  metadata.gz: fb5f0b9e757c88be9651a7fec3f108efbf54ad4c0bc7d6394c88a515691620f9
+  data.tar.gz: ae0a80d45a7ad82610a9c571e7e888758b796ce915df58f6aae168b4ed4b3dcb
 SHA512:
-  metadata.gz: 8e52dd2b5fb04ac6da7b6dd34cf251a0fecfeb415e1675f1979316eee291f3570579bfeb624a00eaead3184af9b79bf5a4d46bd4bf2a1e813ba11a5887312007
-  data.tar.gz: 07d2b7cbdde814f729cbf8e2559bb1797985f844f5598eb5bbc85cfffad8f9546bf991f70afd4ae07d841c78cbf59d602e22657421f9da4acfa4b7efb51931c0
+  metadata.gz: c73b48aa18376691eb9d56f087e03e7b9d7943835fe2d405f37b946dec10e6b863a81c5698561be44da39fe5f989ab6f07ca3d7c4a41f6f76572e60d6033eae2
+  data.tar.gz: f31316136f7f417d7eb9874f639b51a38acaa55164ee23f800437cc4ab54ab7cc2c8aeb4bbd32ac69ff54ab4733f671c74149932a0cdc41fa9b180aaa321751c

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.6

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)

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/schema_creation.rb

@@ -26,22 +26,20 @@ 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)
+          sql << "(" + o.columns.map { |c| quote_column_name(c) }.join(', ') +")"
+          add_sql_comment!(sql.join(' '), o.comment)
         end
 
         def add_table_options!(create_sql, options)
@@ -57,15 +55,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 +81,20 @@ 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

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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-cubrid2-adapter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Eui-Taik Na
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord Cubrid Adapter.