activerecord-spanner-adapter 1.4.2 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfd752e3287084b088f8d8e7ba09d2644ec8bb3c5f699b80425ed7babc74ac1f
-  data.tar.gz: 2c72dad4930f696935f5a8ebe61db261da7ac11d3f8149b22f7bbe0bae900755
+  metadata.gz: f1a935693a8621d55fd7f51a17ba93dcc598f97789e6b7825ca7c916fbc0c9e1
+  data.tar.gz: 671717a9df5b2d7b6bbf388faea2c9ec6f982906a6456271a8696c2980d62684
 SHA512:
-  metadata.gz: 77e3afc2326448c8e7de3e838baf09d87beb631c28129c2588e14ae675cd20ea0bf4c18e89d2e1ec456fb519530dd9d968838fcfc2cab32d5dc66dd5fb586025
-  data.tar.gz: e4525d57eab407c0122a26ec412533e29e3ef51e942577a0686e36d22ddaf1a0243d30cc46ee350386b4ba292c9dc4a81dd7215e0beba5fc0eb08577f89a5ed1
+  metadata.gz: 5fa701ba551c2072ad60e6a7aadde8a4c4e20e3262d091c4854fd37d3663cfa353595017a8de229404c37dc7145ef5852c4ac16f531655c54462e419b217d86b
+  data.tar.gz: 24733bae08d92cd3ad8c7ae4cbbdbf016dc845f3f8b1a962bdde535b8df2627c9dc8a62d4d41cad3ec58a295c22de9ccb01924f95c985d1bf6741d647a0fcf4d

data/.github/workflows/nightly-acceptance-tests-on-emulator.yaml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
         ruby: [2.6, 2.7, 3.0, 3.1, 3.2]
-        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4, 7.0.5]
+        ar: [6.0.0, 6.0.1, 6.0.2.2, 6.0.3.7, 6.0.4, 6.1.3.2, 6.1.4.7, 6.1.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1, 7.0.4, 7.0.5, 7.0.6, 7.0.7]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
@@ -61,6 +61,10 @@ jobs:
             ar: 7.0.4
           - ruby: 2.6
             ar: 7.0.5
+          - ruby: 2.6
+            ar: 7.0.6
+          - ruby: 2.6
+            ar: 7.0.7
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.github/workflows/nightly-acceptance-tests-on-production.yaml

@@ -29,7 +29,7 @@ jobs:
     - name: Install dependencies
       run: bundle install
     - name: Run acceptance tests on production
-      run: bundle exec rake acceptance
+      run: bundle exec rake acceptance\[,,,"exclude cases/migration"\]
       env:
         SPANNER_TEST_PROJECT: ${{ secrets.GCP_PROJECT_ID }}
         SPANNER_TEST_INSTANCE: ruby-activerecord-test

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.4.2"
+  ".": "1.4.4"
 }

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+### 1.4.4 (2023-09-06)
+
+#### Bug Fixes
+
+* Support for changes in Rails 7.0.7. ([#260](https://github.com/googleapis/ruby-spanner-activerecord/issues/260)) 
+
+### 1.4.3 (2023-06-09)
+
+#### Bug Fixes
+
+* unquote string default value ([#253](https://github.com/googleapis/ruby-spanner-activerecord/issues/253)) 
+
 ### 1.4.2 (2023-06-01)
 
 #### Bug Fixes

data/acceptance/cases/migration/rename_column_test.rb

@@ -23,21 +23,23 @@ module ActiveRecord
         skip_test_table_create!
         super
 
-        connection.drop_table :rename_column_comments, if_exists: true
-        connection.drop_table :rename_column_posts, if_exists: true
-
-        connection.create_table(:rename_column_posts) do |t|
-          t.string :name, limit: 128
-          t.integer :comment_count
-        end
-
-        connection.create_table(:rename_column_comments) do |t|
-          t.string :comment
-          # The Spanner ActiveRecord adapter does not support creating an index on a column that also has a foreign key,
-          # as Cloud Spanner automatically creates a managed index for the foreign key. The index is therefore created
-          # separately.
-          t.references :rename_column_post, foreign_key: true
-          t.index :rename_column_post_id
+        connection.ddl_batch do
+          connection.drop_table :rename_column_comments, if_exists: true
+          connection.drop_table :rename_column_posts, if_exists: true
+
+          connection.create_table(:rename_column_posts) do |t|
+            t.string :name, limit: 128
+            t.integer :comment_count
+          end
+
+          connection.create_table(:rename_column_comments) do |t|
+            t.string :comment
+            # The Spanner ActiveRecord adapter does not support creating an index on a column that also has a foreign key,
+            # as Cloud Spanner automatically creates a managed index for the foreign key. The index is therefore created
+            # separately.
+            t.references :rename_column_post, foreign_key: true
+            t.index :rename_column_post_id
+          end
         end
 
         RenameColumnPost.reset_column_information

data/acceptance/cases/models/default_value_test.rb

@@ -7,15 +7,47 @@ module Models
   class DefaultValueTest < SpannerAdapter::TestCase
     include TestHelpers::WithSeparateDatabase
 
-    class DynamicItem < ActiveRecord::Base; end
+    class LiteralValue < ActiveRecord::Base; end
+    class ExpressionValue < ActiveRecord::Base; end
 
-    def test_dynamic_default_values
-      connection.create_table :dynamic_items do |t|
+    def test_literal_default_values
+      default = OpenStruct.new(
+        col_string: "default",
+        col_int64: 123,
+        col_float64: 1.23,
+        col_numeric: BigDecimal("1.23"),
+        col_bool: true,
+        col_date: Date.new(2023, 5, 9),
+        col_timestamp: DateTime.new(2023, 5, 9, 1, 2, 3),
+      )
+
+      connection.create_table :literal_values do |t|
+        t.column :col_string, :string, default: default.col_string
+        t.column :col_int64, :bigint, default: default.col_int64
+        t.column :col_float64, :float, default: default.col_float64
+        t.column :col_numeric, :numeric, default: default.col_numeric
+        t.column :col_bool, :boolean, default: default.col_bool
+        t.column :col_date, :date, default: default.col_date
+        t.column :col_timestamp, :datetime, default: default.col_timestamp
+      end
+
+      item = LiteralValue.new
+      default.each_pair { |col, expected| assert_equal(expected, item[col]) }
+      item.save!
+      default.each_pair { |col, expected| assert_equal(expected, item[col]) }
+      item.reload
+      default.each_pair { |col, expected| assert_equal(expected, item[col]) }
+    end
+
+    def test_expression_default_values
+      connection.create_table :expression_values do |t|
+        t.column :col_numeric, :numeric, default: -> { "NUMERIC '1.23'" }
         t.column :col_timestamp, :datetime, default: -> { "CURRENT_TIMESTAMP()" }
       end
 
-      item = DynamicItem.create!
+      item = ExpressionValue.create!
       item.reload
+      assert_equal(BigDecimal("1.23"), item.col_numeric)
       assert(item.col_timestamp)
     end
   end

data/acceptance/test_helpers/with_separate_database.rb

@@ -20,6 +20,7 @@ module TestHelpers
 
     def teardown
       spanner_adapter_connection.database.drop
+      ActiveRecord::Base.connection_pool.disconnect!
     end
 
     def connection_config

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

@@ -32,12 +32,15 @@ module ActiveRecord
   module ConnectionAdapters
     module Spanner
       module Quoting
+        QUOTED_COLUMN_NAMES = Concurrent::Map.new # :nodoc:
+        QUOTED_TABLE_NAMES = Concurrent::Map.new # :nodoc:
+
         def quote_column_name name
-          self.class.quoted_column_names[name] ||= "`#{super.gsub '`', '``'}`".freeze
+          QUOTED_COLUMN_NAMES[name] ||= "`#{super.gsub '`', '``'}`".freeze
         end
 
         def quote_table_name name
-          self.class.quoted_table_names[name] ||= super.gsub(".", "`.`").freeze
+          QUOTED_TABLE_NAMES[name] ||= super.gsub(".", "`.`").freeze
         end
 
         STR_ESCAPE_REGX = /[\n\r'\\]/.freeze

data/lib/activerecord_spanner_adapter/information_schema.rb

@@ -87,6 +87,10 @@ module ActiveRecordSpannerAdapter
           default = nil
         end
 
+        if default && type == "STRING"
+          default = unquote_string default
+        end
+
         Table::Column.new \
           table_name,
           column_name,
@@ -286,8 +290,70 @@ module ActiveRecordSpannerAdapter
       [matched[1], limit]
     end
 
+    def unquote_string value
+      return unquote_raw_string value, 1 if value[0] == "r" || value[0] == "R"
+      unescape_string unquote_raw_string value
+    end
+
     private
 
+    def unquote_raw_string value, prefix_length = 0
+      triple_quote_range = prefix_length..(prefix_length + 2)
+      if value[triple_quote_range] == '"""' || value[triple_quote_range] == "'''"
+        value[(prefix_length + 3)...-3]
+      else
+        value[(prefix_length + 1)...-1]
+      end
+    end
+
+    def unescape_string value # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      str = ""
+      i = 0
+
+      while i < value.length
+        case value[i]
+        when "\\"
+          i += 1
+          case value[i]
+          when "a" then str += "\a"
+          when "b" then str += "\b"
+          when "f" then str += "\f"
+          when "n" then str += "\n"
+          when "r" then str += "\r"
+          when "t" then str += "\t"
+          when "v" then str += "\v"
+          when "\\" then str += "\\"
+          when "?" then str += "?"
+          when "'" then str += "'"
+          when '"' then str += '"'
+          when "`" then str += "`"
+          when "0".."7"
+            str += unescape_unicode value, i, 3, 8
+            i += 2
+          when "x", "X"
+            str += unescape_unicode value, i + 1, 2, 16
+            i += 2
+          when "u"
+            str += unescape_unicode value, i + 1, 4, 16
+            i += 4
+          when "U"
+            str += unescape_unicode value, i + 1, 8, 16
+            i += 8
+          end
+        else
+          str += value[i]
+        end
+
+        i += 1
+      end
+
+      str
+    end
+
+    def unescape_unicode value, start, length, base
+      [value[start...(start + length)].to_i(base)].pack "U"
+    end
+
     def column_options table_name, column_name
       sql = +"SELECT COLUMN_NAME, OPTION_NAME, OPTION_TYPE, OPTION_VALUE"
       sql << " FROM INFORMATION_SCHEMA.COLUMN_OPTIONS"

data/lib/activerecord_spanner_adapter/version.rb

@@ -5,5 +5,5 @@
 # https://opensource.org/licenses/MIT.
 
 module ActiveRecordSpannerAdapter
-  VERSION = "1.4.2".freeze
+  VERSION = "1.4.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-spanner-adapter
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.4
 platform: ruby
 authors:
 - Google LLC
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-01 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-spanner
@@ -539,7 +539,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Rails ActiveRecord connector for Google Spanner Database