activerecord-spanner-adapter 1.2.1 → 1.3.1

data/acceptance/schema/schema.rb

@@ -6,140 +6,145 @@
 
 # frozen_string_literal: true
 
-ActiveRecord::Schema.define do
-  ActiveRecord::Base.connection.ddl_batch do
-    create_table :all_types do |t|
-      t.column :col_string, :string
-      t.column :col_int64, :bigint
-      t.column :col_float64, :float
-      t.column :col_numeric, :numeric
-      t.column :col_bool, :boolean
-      t.column :col_bytes, :binary
-      t.column :col_date, :date
-      t.column :col_timestamp, :datetime
-      t.column :col_json, :json
-
-      t.column :col_array_string, :string, array: true
-      t.column :col_array_int64, :bigint, array: true
-      t.column :col_array_float64, :float, array: true
-      t.column :col_array_numeric, :numeric, array: true
-      t.column :col_array_bool, :boolean, array: true
-      t.column :col_array_bytes, :binary, array: true
-      t.column :col_array_date, :date, array: true
-      t.column :col_array_timestamp, :datetime, array: true
-      t.column :col_array_json, :json, array: true
-    end
-
-    create_table :firms do |t|
-      t.string  :name
-      t.integer :rating
-      t.string :description
-      t.references :account
-    end
-
-    create_table :customers do |t|
-      t.string  :name
-    end
-
-    create_table :accounts do |t|
-      t.references :customer, index: false
-      t.references :firm, index: false
-      t.string  :name
-      t.integer :credit_limit
-      t.integer :transactions_count
-    end
-
-    create_table :transactions do |t|
-      t.float :amount
-      t.references :account, index: false
-    end
-
-    create_table :departments do |t|
-      t.string :name
-      t.references :resource, polymorphic: true
-    end
-
-    create_table :member_types do |t|
-      t.string :name
-    end
-
-    create_table :members do |t|
-      t.string :name
-      t.references :member_type, index: false
-      t.references :admittable, polymorphic: true, index: false
-    end
-
-    create_table :memberships do |t|
-      t.datetime :joined_on
-      t.references :club, index: false
-      t.references :member, index: false
-      t.boolean :favourite
-    end
-
-    create_table :clubs do |t|
-      t.string :name
-    end
-
-    create_table :authors do |t|
-      t.string :name, null: false
-      t.date :registered_date
-      t.references :organization, index: false
-    end
-
-    create_table :posts do |t|
-      t.string :title
-      t.string :content
-      t.references :author
-      t.integer :comments_count
-      t.date :post_date
-      t.time :published_time
-    end
-
-    create_table :comments do |t|
-      t.string :comment
-      t.references :post, index: false, foreign_key: true
-    end
-
-    create_table :addresses do |t|
-      t.string :line1
-      t.string :postal_code
-      t.string :city
-      t.references :author, index: false
-    end
-
-    create_table :organizations do |t|
-      t.string :name
-      t.datetime :last_updated, allow_commit_timestamp: true
-    end
-
-    create_table :singers, id: false do |t|
-      t.primary_key :singerid
-      t.column :first_name, :string, limit: 200
-      t.string :last_name
-      t.integer :tracks_count
-      t.integer :lock_version
-      t.string :full_name, as: "COALESCE(first_name || ' ', '') || last_name", stored: true
-    end
-
-    create_table :albums, id: false do |t|
-      t.interleave_in :singers
-      t.primary_key :albumid
-      # `singerid` is part of the primary key in the table definition, but it is not visible to ActiveRecord as part of
-      # the primary key, to prevent ActiveRecord from considering this to be an entity with a composite primary key.
-      t.parent_key :singerid
-      t.string :title
-      t.integer :lock_version
-    end
+def create_tables_in_test_schema
+  ActiveRecord::Schema.define(version: 1) do
+    ActiveRecord::Base.connection.ddl_batch do
+      create_table :all_types, id: { limit: 8 } do |t|
+        t.column :col_string, :string
+        t.column :col_int64, :bigint
+        t.column :col_float64, :float
+        t.column :col_numeric, :numeric
+        t.column :col_bool, :boolean
+        t.column :col_bytes, :binary
+        t.column :col_date, :date
+        t.column :col_timestamp, :datetime
+        t.column :col_json, :json
+
+        t.column :col_array_string, :string, array: true
+        t.column :col_array_int64, :bigint, array: true
+        t.column :col_array_float64, :float, array: true
+        t.column :col_array_numeric, :numeric, array: true
+        t.column :col_array_bool, :boolean, array: true
+        t.column :col_array_bytes, :binary, array: true
+        t.column :col_array_date, :date, array: true
+        t.column :col_array_timestamp, :datetime, array: true
+        t.column :col_array_json, :json, array: true
+      end
+
+      create_table :firms do |t|
+        t.string  :name
+        t.integer :rating
+        t.string :description
+        t.references :account
+      end
+
+      create_table :customers do |t|
+        t.string  :name
+      end
+
+      create_table :accounts do |t|
+        t.references :customer, index: false
+        t.references :firm, index: false
+        t.string  :name
+        t.integer :credit_limit
+        t.integer :transactions_count
+      end
+
+      create_table :transactions do |t|
+        t.float :amount
+        t.references :account, index: false
+      end
+
+      create_table :departments do |t|
+        t.string :name
+        t.references :resource, polymorphic: true, index: { name: "index_departments_on_resource" }
+      end
+
+      create_table :member_types do |t|
+        t.string :name
+      end
+
+      create_table :members do |t|
+        t.string :name
+        t.references :member_type, index: false
+        t.references :admittable, polymorphic: true, index: false
+      end
+
+      create_table :memberships do |t|
+        t.datetime :joined_on
+        t.references :club, index: false
+        t.references :member, index: false
+        t.boolean :favourite
+      end
+
+      create_table :clubs do |t|
+        t.string :name
+      end
+
+      create_table :authors do |t|
+        t.string :name, null: false
+        t.date :registered_date
+        t.references :organization, index: false
+      end
+
+      create_table :posts do |t|
+        t.string :title
+        t.string :content
+        t.references :author
+        t.integer :comments_count
+        t.date :post_date
+        t.time :published_time
+      end
+
+      create_table :comments do |t|
+        t.string :comment
+        t.references :post, index: false, foreign_key: true
+      end
+
+      create_table :addresses do |t|
+        t.string :line1
+        t.string :postal_code
+        t.string :city
+        t.references :author, index: false
+      end
+
+      create_table :organizations do |t|
+        t.string :name
+        t.datetime :last_updated, allow_commit_timestamp: true
+      end
+
+      create_table :singers, id: false do |t|
+        t.primary_key :singerid
+        t.column :first_name, :string, limit: 200
+        t.string :last_name
+        t.integer :tracks_count
+        t.integer :lock_version
+        t.virtual :full_name, type: :string, as: "COALESCE(first_name || ' ', '') || last_name", stored: true
+      end
+
+      create_table :albums, id: false do |t|
+        t.interleave_in :singers
+        t.primary_key :albumid
+        # `singerid` is part of the primary key in the table definition, but it is not visible to ActiveRecord as part of
+        # the primary key, to prevent ActiveRecord from considering this to be an entity with a composite primary key.
+        t.parent_key :singerid
+        t.string :title
+        t.integer :lock_version
+      end
+
+      create_table :tracks, id: false do |t|
+        # `:cascade` causes all tracks that belong to an album to automatically be deleted when an album is deleted.
+        t.interleave_in :albums, :cascade
+        t.primary_key :trackid
+        t.parent_key :singerid
+        t.parent_key :albumid
+        t.string :title
+        t.numeric :duration
+        t.integer :lock_version
+      end
+
+      add_index :tracks, [:singerid, :albumid, :title], interleave_in: :albums, null_filtered: true, unique: false
 
-    create_table :tracks, id: false do |t|
-      # `:cascade` causes all tracks that belong to an album to automatically be deleted when an album is deleted.
-      t.interleave_in :albums, :cascade
-      t.primary_key :trackid
-      t.parent_key :singerid
-      t.parent_key :albumid
-      t.string :title
-      t.numeric :duration
-      t.integer :lock_version
     end
   end
-end
+end

data/acceptance/test_helper.rb

@@ -64,6 +64,7 @@ def create_test_database
   puts "Loading test schema..."
   ActiveRecord::Base.establish_connection connector_config
   require_relative "schema/schema"
+  create_tables_in_test_schema
 end
 
 def drop_test_database
@@ -83,6 +84,7 @@ def load_test_schema
   ActiveRecord::Base.establish_connection connector_config
 
   require_relative "schema/schema"
+  create_tables_in_test_schema
 end
 
 module SpannerAdapter

data/examples/snippets/array-data-type/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
@@ -11,8 +11,9 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
-  create_table "entity_with_array_types", force: :cascade do |t|
+  create_table "entity_with_array_types", id: { limit: 8 }, force: :cascade do |t|
     t.string "col_array_string"
     t.integer "col_array_int64", limit: 8
     t.float "col_array_float64"
@@ -23,4 +24,8 @@ ActiveRecord::Schema.define(version: 1) do
     t.time "col_array_timestamp"
   end
 
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end

data/examples/snippets/bulk-insert/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
@@ -11,16 +11,21 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
-  create_table "albums", force: :cascade do |t|
+  create_table "albums", id: { limit: 8 }, force: :cascade do |t|
     t.string "title"
     t.integer "singer_id", limit: 8
   end
 
-  create_table "singers", force: :cascade do |t|
+  create_table "singers", id: { limit: 8 }, force: :cascade do |t|
     t.string "first_name"
     t.string "last_name"
   end
 
   add_foreign_key "albums", "singers"
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end

data/examples/snippets/commit-timestamp/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
@@ -11,19 +11,24 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
-  create_table "albums", force: :cascade do |t|
+  create_table "albums", id: { limit: 8 }, force: :cascade do |t|
     t.string "title"
     t.decimal "marketing_budget"
     t.integer "singer_id", limit: 8
-    t.time "last_updated"
+    t.time "last_updated", allow_commit_timestamp: true
   end
 
-  create_table "singers", force: :cascade do |t|
+  create_table "singers", id: { limit: 8 }, force: :cascade do |t|
     t.string "first_name"
     t.string "last_name"
-    t.time "last_updated"
+    t.time "last_updated", allow_commit_timestamp: true
   end
 
   add_foreign_key "albums", "singers"
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end

data/examples/snippets/create-records/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
@@ -11,16 +11,21 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
-  create_table "albums", force: :cascade do |t|
+  create_table "albums", id: { limit: 8 }, force: :cascade do |t|
     t.string "title"
     t.integer "singer_id", limit: 8
   end
 
-  create_table "singers", force: :cascade do |t|
+  create_table "singers", id: { limit: 8 }, force: :cascade do |t|
     t.string "first_name"
     t.string "last_name"
   end
 
   add_foreign_key "albums", "singers"
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end

data/examples/snippets/date-data-type/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
@@ -11,11 +11,16 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
-  create_table "singers", force: :cascade do |t|
+  create_table "singers", id: { limit: 8 }, force: :cascade do |t|
     t.string "first_name"
     t.string "last_name"
     t.date "birth_date"
   end
 
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end

data/examples/snippets/generated-column/db/schema.rb

@@ -11,11 +11,16 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
   create_table "singers", id: { limit: 8 }, force: :cascade do |t|
     t.string "first_name", limit: 100
     t.string "last_name", limit: 200, null: false
-    t.string "full_name", limit: 300, null: false
+    t.virtual "full_name", type: :string, limit: 300, null: false, as: "COALESCE(first_name || ' ', '') || last_name", stored: true
   end
 
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end

data/examples/snippets/hints/db/schema.rb

@@ -11,6 +11,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
   create_table "albums", id: { limit: 8 }, force: :cascade do |t|
     t.string "title"
@@ -20,9 +21,13 @@ ActiveRecord::Schema.define(version: 1) do
   create_table "singers", id: { limit: 8 }, force: :cascade do |t|
     t.string "first_name", limit: 100
     t.string "last_name", limit: 200, null: false
-    t.string "full_name", limit: 300, null: false
+    t.virtual "full_name", type: :string, limit: 300, null: false, as: "COALESCE(first_name || ' ', '') || last_name", stored: true
     t.index ["full_name"], name: "index_singers_on_full_name", order: { full_name: :asc }
   end
 
   add_foreign_key "albums", "singers"
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end

data/examples/snippets/interleaved-tables/README.md

@@ -85,7 +85,7 @@ end
 
 ## Models for Interleaved Tables
 The model definition for an interleaved table (a child table) must use the `primary_keys=col1, col2, ...`
-function from the `composite_primary_key` gem.
+function from the `composite_primary_keys` gem.
 
 An interleaved table parent/child relationship must be modelled as a `belongs_to`/`has_many` association in
 ActiveRecord. As the columns that are used to reference a parent record use a custom column name, it is required to also
@@ -161,4 +161,4 @@ Run the application with the command
 
 ```bash
 bundle exec rake run
-```
+```

data/examples/snippets/interleaved-tables/db/schema.rb

@@ -11,6 +11,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
   create_table "albums", primary_key: "albumid", id: { limit: 8 }, force: :cascade do |t|
     t.integer "singerid", limit: 8, null: false
@@ -29,4 +30,8 @@ ActiveRecord::Schema.define(version: 1) do
     t.decimal "duration"
   end
 
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end

data/examples/snippets/migrations/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
@@ -11,23 +11,28 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
-  create_table "albums", force: :cascade do |t|
+  create_table "albums", id: { limit: 8 }, force: :cascade do |t|
     t.string "title"
     t.integer "singers_id", limit: 8
     t.index ["singers_id"], name: "index_albums_on_singers_id", order: { singers_id: :asc }
   end
 
-  create_table "singers", force: :cascade do |t|
+  create_table "singers", id: { limit: 8 }, force: :cascade do |t|
     t.string "first_name"
     t.string "last_name"
   end
 
-  create_table "tracks", force: :cascade do |t|
+  create_table "tracks", id: { limit: 8 }, force: :cascade do |t|
     t.string "title"
     t.decimal "duration"
     t.integer "albums_id", limit: 8
     t.index ["albums_id"], name: "index_tracks_on_albums_id", order: { albums_id: :asc }
   end
 
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end

data/examples/snippets/mutations/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
@@ -11,17 +11,22 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 1) do
+  connection.start_batch_ddl
 
-  create_table "albums", force: :cascade do |t|
+  create_table "albums", id: { limit: 8 }, force: :cascade do |t|
     t.string "title"
     t.decimal "marketing_budget"
     t.integer "singer_id", limit: 8
   end
 
-  create_table "singers", force: :cascade do |t|
+  create_table "singers", id: { limit: 8 }, force: :cascade do |t|
     t.string "first_name"
     t.string "last_name"
   end
 
   add_foreign_key "albums", "singers"
+  connection.run_batch
+rescue
+  abort_batch
+  raise
 end