activerecord-spanner-adapter 1.3.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b6dba891089af7c51b13f3b80ce8342b691d31cd0e31181dbd5799c240a2e9c
-  data.tar.gz: 54a6079aa300d4e31bb8f47630857e624e94995dc713aae60aa848ac3da41ca0
+  metadata.gz: 2f432fe0aba4f4aaa5d2bcc689d8337fb944b393a8f71e11731f21bd2bc1aad5
+  data.tar.gz: 3dd03abd67174f3b7239d2c19a18ae0df756ad009988ae8ecddbd2369eb7164b
 SHA512:
-  metadata.gz: d5f05cd6a79976d974d3d5aa472d514146b5367dae7a4c334913627acc0c98154c8a247c0225a42f235c976b9d3e28cd8c29c46a3c1e876eda6c181619e11617
-  data.tar.gz: b943df790fa40955c31b5e9df89396a84d5f9b0499e8d610758238a249de1cc693b53f87f9b5d134b6595be5677222b04685206b8ca5d28472e6f9fbdac20ad9
+  metadata.gz: d99d549f841dcb2facf0438335b06449f70e033ad9c030fa2396fff16650e8a9ee653157ee8699cd9e473515630766e2f9b3e117acc73d6ddf35fb8ee83724a1
+  data.tar.gz: 4e207e65e60ab191c7479f7ae47c9fdd0ebac9a5ca54505841155428b88dc60c379dae96db6e43cd17e8c2bc2af9d9b7b5b4c5ae091281416cdf9d7616edaf9c

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

@@ -18,16 +18,16 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: [2.6, 2.7, 3.0]
-        ar: [6.0.5.1, 6.1.6.1, 7.0.2.4, 7.0.3.1]
+        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4"]
         # Exclude combinations that are not supported.
         exclude:
-          - ruby: 3.0
-            ar: 6.0.5.1
-          - ruby: 2.6
-            ar: 7.0.2.4
-          - ruby: 2.6
-            ar: 7.0.3.1
+          - ruby: "3.0"
+            ar: "~> 6.0.6"
+          - ruby: "3.1"
+            ar: "~> 6.0.6"
+          - ruby: "2.6"
+            ar: "~> 7.0.4"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.github/workflows/ci.yaml

@@ -10,14 +10,16 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        ruby: ["2.6", "2.7", "3.0"]
-        ar: ["6.0.4", "6.1.4", "7.0.2.4"]
+        ruby: ["2.6", "2.7", "3.0", "3.1"]
+        ar: ["~> 6.0.6", "~> 6.1.7", "~> 7.0.4"]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: "3.0"
-            ar: "6.0.4"
+            ar: "~> 6.0.6"
+          - ruby: "3.1"
+            ar: "~> 6.0.6"
           - ruby: "2.6"
-            ar: "7.0.2.4"
+            ar: "~> 7.0.4"
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

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

@@ -19,8 +19,8 @@ jobs:
       max-parallel: 4
       matrix:
         # Run acceptance tests all supported combinations of Ruby and ActiveRecord.
-        ruby: [2.5, 2.6, 2.7, 3.0]
-        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]
+        ruby: [2.6, 2.7, 3.0, 3.1]
+        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]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
@@ -33,14 +33,22 @@ jobs:
             ar: 6.0.3.7
           - ruby: 3.0
             ar: 6.0.4
-          - ruby: 2.5
-            ar: 7.0.2.4
+          - ruby: 3.1
+            ar: 6.0.0
+          - ruby: 3.1
+            ar: 6.0.1
+          - ruby: 3.1
+            ar: 6.0.2.2
+          - ruby: 3.1
+            ar: 6.0.3.7
+          - ruby: 3.1
+            ar: 6.0.4
           - ruby: 2.6
             ar: 7.0.2.4
-          - ruby: 2.5
-            ar: 7.0.3.1
           - ruby: 2.6
             ar: 7.0.3.1
+          - ruby: 2.6
+            ar: 7.0.4
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.github/workflows/nightly-unit-tests.yaml

@@ -11,8 +11,8 @@ jobs:
       max-parallel: 4
       matrix:
         # Run unit tests all supported combinations of Ruby and ActiveRecord.
-        ruby: [2.5, 2.6, 2.7, 3.0]
-        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]
+        ruby: [2.6, 2.7, 3.0, 3.1]
+        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]
         # Exclude combinations that are not supported.
         exclude:
           - ruby: 3.0
@@ -25,14 +25,22 @@ jobs:
             ar: 6.0.3.7
           - ruby: 3.0
             ar: 6.0.4
-          - ruby: 2.5
-            ar: 7.0.2.4
+          - ruby: 3.1
+            ar: 6.0.0
+          - ruby: 3.1
+            ar: 6.0.1
+          - ruby: 3.1
+            ar: 6.0.2.2
+          - ruby: 3.1
+            ar: 6.0.3.7
+          - ruby: 3.1
+            ar: 6.0.4
           - ruby: 2.6
             ar: 7.0.2.4
-          - ruby: 2.5
-            ar: 7.0.3.1
           - ruby: 2.6
             ar: 7.0.3.1
+          - ruby: 2.6
+            ar: 7.0.4
     env:
       AR_VERSION: ${{ matrix.ar }}
     steps:

data/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.3.1"
+  ".": "1.4.1"
 }

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+### 1.4.1 (2023-03-01)
+
+#### Bug Fixes
+
+* wrap default values in () as required ([#238](https://github.com/googleapis/ruby-spanner-activerecord/issues/238)) 
+#### Documentation
+
+* call out best practices and dialect compatibility ([#240](https://github.com/googleapis/ruby-spanner-activerecord/issues/240)) 
+
+### 1.4.0 (2023-01-18)
+
+#### Features
+
+* dropped support for Ruby 2.5 ([#236](https://github.com/googleapis/ruby-spanner-activerecord/issues/236)) 
+
 ### 1.3.1 (2022-12-15)
 
 #### Bug Fixes

data/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "activerecord", ENV.fetch("AR_VERSION", "~> 6.1.6.1")
-gem "minitest", "~> 5.15.0"
+gem "minitest", "~> 5.16.3"
 gem "pry", "~> 0.13.0"
 gem "pry-byebug", "~> 3.9.0"
 

data/README.md

@@ -4,6 +4,9 @@
 
 ![rubocop](https://github.com/googleapis/ruby-spanner-activerecord/workflows/rubocop/badge.svg)
 
+__This adapter only supports GoogleSQL-dialect Cloud Spanner databases. PostgreSQL-dialect
+databases are not supported.__
+
 This project provides a Cloud Spanner adapter for ActiveRecord. It supports the following versions:
 
 - ActiveRecord 6.0.x with Ruby 2.6 and 2.7.
@@ -13,9 +16,6 @@ This project provides a Cloud Spanner adapter for ActiveRecord. It supports the
 Known limitations are listed in the [Limitations](#limitations) section.
 Please report any problems that you might encounter by [creating a new issue](https://github.com/googleapis/ruby-spanner-activerecord/issues/new).
 
-This adapter only supports GoogleSQL-dialect Cloud Spanner databases. PostgreSQL-dialect
-databases are not supported.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -36,6 +36,14 @@ And then execute:
 
 ## Usage
 
+### Migrations
+__Use DDL batching when executing migrations for the best possible performance.__
+
+Executing multiple schema changes on Cloud Spanner can take a long time. It is therefore
+strongly recommended that you limit the number of schema change operations. You can do
+this by using DDL batching in your migrations. See [the migrations examples](examples/snippets/migrations)
+for how to do this.
+
 ### Database Connection
 In Rails application `config/database.yml`, make the change as the following:
 

data/acceptance/cases/migration/change_schema_test.rb

@@ -120,6 +120,27 @@ module ActiveRecord
         end
       end
 
+      def test_create_table_with_column_default
+        testings_klass = Class.new ActiveRecord::Base
+        connection.ddl_batch do
+          connection.create_table :testings do |t|
+            t.string :name, null: false, default: "no name"
+            t.integer :age, null: false, default: 10
+          end
+          testings_klass.table_name = "testings"
+        end
+
+        testings_klass.reset_column_information
+        assert_equal false, testings_klass.columns_hash["name"].null
+        assert_equal false, testings_klass.columns_hash["age"].null
+
+        assert_nothing_raised {
+          testings_klass.connection.transaction {
+            testings_klass.connection.execute("insert into testings (id, name, age) values (#{generate_id}, DEFAULT, DEFAULT)")
+          }
+        }
+      end
+
       def test_create_table_with_limits
         connection.ddl_batch do
           connection.create_table :testings do |t|

data/acceptance/cases/migration/change_table_test.rb

@@ -30,77 +30,87 @@ module ActiveRecord
 
       def test_remove_references_column_type_with_polymorphic_removes_type
         with_change_table do |t|
-          @connection.expect :remove_reference, nil, [:delete_me, :taggable, polymorphic: true]
+          @connection.expect :remove_reference, nil, [:delete_me, :taggable], polymorphic: true
           t.remove_references :taggable, polymorphic: true
         end
       end
 
       def test_references_column_type_with_polymorphic_and_options_null_is_false_adds_table_flag
         with_change_table do |t|
-          @connection.expect :add_reference, nil, [:delete_me, :taggable, polymorphic: true, null: false]
+          @connection.expect :add_reference, nil, [:delete_me, :taggable], polymorphic: true, null: false
           t.references :taggable, polymorphic: true, null: false
         end
       end
 
       def test_remove_references_column_type_with_polymorphic_and_options_null_is_false_removes_table_flag
         with_change_table do |t|
-          @connection.expect :remove_reference, nil, [:delete_me, :taggable, polymorphic: true, null: false]
+          @connection.expect :remove_reference, nil, [:delete_me, :taggable], polymorphic: true, null: false
           t.remove_references :taggable, polymorphic: true, null: false
         end
       end
 
       def test_references_column_type_with_polymorphic_and_type
         with_change_table do |t|
-          @connection.expect :add_reference, nil, [:delete_me, :taggable, polymorphic: true, type: :string]
+          @connection.expect :add_reference, nil, [:delete_me, :taggable], polymorphic: true, type: :string
           t.references :taggable, polymorphic: true, type: :string
         end
       end
 
       def test_remove_references_column_type_with_polymorphic_and_type
         with_change_table do |t|
-          @connection.expect :remove_reference, nil, [:delete_me, :taggable, polymorphic: true, type: :string]
+          @connection.expect :remove_reference, nil, [:delete_me, :taggable], polymorphic: true, type: :string
           t.remove_references :taggable, polymorphic: true, type: :string
         end
       end
 
       def test_timestamps_creates_updated_at_and_created_at
         with_change_table do |t|
-          @connection.expect :add_timestamps, nil, [:delete_me, null: true]
+          @connection.expect :add_timestamps, nil, [:delete_me], null: true
           t.timestamps null: true
         end
       end
 
       def test_remove_timestamps_creates_updated_at_and_created_at
         with_change_table do |t|
-          @connection.expect :remove_timestamps, nil, [:delete_me, { null: true }]
+          @connection.expect :remove_timestamps, nil, [:delete_me], null: true
           t.remove_timestamps(null: true)
         end
       end
 
       def test_primary_key_creates_primary_key_column
         with_change_table do |t|
-          @connection.expect :add_column, nil, [:delete_me, :id, :primary_key, primary_key: true, first: true]
+          @connection.expect :add_column, nil, [:delete_me, :id, :primary_key], primary_key: true, first: true
           t.primary_key :id, first: true
         end
       end
 
       def test_index_exists
         with_change_table do |t|
-          @connection.expect :index_exists?, nil, [:delete_me, :bar, {}]
-          t.index_exists?(:bar)
+          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3")
+            @connection.expect :index_exists?, nil, [:delete_me, :bar, {}]
+            t.index_exists?(:bar, {})
+          else
+            @connection.expect :index_exists?, nil, [:delete_me, :bar]
+            t.index_exists?(:bar)
+          end
         end
       end
 
       def test_index_exists_with_options
         with_change_table do |t|
-          @connection.expect :index_exists?, nil, [:delete_me, :bar, { unique: true }]
-          t.index_exists?(:bar, unique: true)
+          if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3")
+            @connection.expect :index_exists?, nil, [:delete_me, :bar, {unique: true}]
+            t.index_exists?(:bar, {unique: true})
+          else
+            @connection.expect :index_exists?, nil, [:delete_me, :bar], unique: true
+            t.index_exists?(:bar, unique: true)
+          end
         end
       end
 
       def test_remove_drops_multiple_columns_when_column_options_are_given
         with_change_table do |t|
-          @connection.expect :remove_columns, nil, [:delete_me, :bar, :baz, type: :string, null: false]
+          @connection.expect :remove_columns, nil, [:delete_me, :bar, :baz], type: :string, null: false
           t.remove :bar, :baz, type: :string, null: false
         end
       end

data/acceptance/cases/models/logging_test.rb

@@ -20,6 +20,8 @@ module ActiveRecord
       end
 
       def test_logs_without_binds
+        skip "This test sometimes fails because nothing is logged (or marked as logged by the test logger)"
+
         published_time = Time.new(2016, 05, 11, 19, 0, 0)
         Post.where(published_time: published_time, title: 'Title - 1').first
 
@@ -30,6 +32,8 @@ module ActiveRecord
       end
 
       def test_logs_with_binds
+        skip "This test sometimes fails because nothing is logged (or marked as logged by the test logger)"
+
         ActiveRecord::ConnectionAdapters::SpannerAdapter.log_statement_binds = true
 
         published_time = Time.new(2016, 05, 11, 19, 0, 0)

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

@@ -129,7 +129,7 @@ module ActiveRecord
             sql << " NOT NULL"
           end
           if options.key? :default
-            sql << " DEFAULT #{quote_default_expression options[:default], column}"
+            sql << " DEFAULT (#{quote_default_expression options[:default], column})"
           end
 
           if !options[:allow_commit_timestamp].nil? &&

data/lib/activerecord_spanner_adapter/version.rb

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

metadata

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