ibm_db 5.2.0-x86-mingw32 → 5.3.2-x86-mingw32

data/test/models/vertex.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 # This class models a vertex in a directed graph.
 class Vertex < ActiveRecord::Base
-  has_many :sink_edges, :class_name => 'Edge', :foreign_key => 'source_id'
-  has_many :sinks, :through => :sink_edges
+  has_many :sink_edges, class_name: "Edge", foreign_key: "source_id"
+  has_many :sinks, through: :sink_edges
 
   has_and_belongs_to_many :sources,
-    :class_name => 'Vertex', :join_table => 'edges',
-    :foreign_key => 'sink_id', :association_foreign_key => 'source_id'
+    class_name: "Vertex", join_table: "edges",
+    foreign_key: "sink_id", association_foreign_key: "source_id"
 end

data/test/models/warehouse_thing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class WarehouseThing < ActiveRecord::Base
   self.table_name = "warehouse_things"
 

data/test/models/wheel.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Wheel < ActiveRecord::Base
-  belongs_to :wheelable, :polymorphic => true, :counter_cache => true
+  belongs_to :wheelable, polymorphic: true, counter_cache: true, touch: :wheels_owned_at
 end

data/test/models/without_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class WithoutTable < ActiveRecord::Base
-  default_scope -> { where(:published => true) }
+  default_scope -> { where(published: true) }
 end

data/test/models/zine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Zine < ActiveRecord::Base
-  has_many :interests, :inverse_of => :zine
+  has_many :interests, inverse_of: :zine, foreign_key: "zine_id"
 end

data/test/schema/mysql2_specific_schema.rb

@@ -1,14 +1,33 @@
-ActiveRecord::Schema.define do
+# frozen_string_literal: true
 
-  if ActiveRecord::Base.connection.version >= '5.6.0'
+ActiveRecord::Schema.define do
+  if supports_datetime_with_precision?
     create_table :datetime_defaults, force: true do |t|
-      t.datetime :modified_datetime, default: -> { 'CURRENT_TIMESTAMP' }
+      t.datetime :modified_datetime, default: -> { "CURRENT_TIMESTAMP" }
+      t.datetime :precise_datetime, precision: 6, default: -> { "CURRENT_TIMESTAMP(6)" }
+    end
+
+    create_table :timestamp_defaults, force: true do |t|
+      t.timestamp :nullable_timestamp
+      t.timestamp :modified_timestamp, default: -> { "CURRENT_TIMESTAMP" }
+      t.timestamp :precise_timestamp, precision: 6, default: -> { "CURRENT_TIMESTAMP(6)" }
+    end
+  end
+
+  create_table :defaults, force: true do |t|
+    t.date :fixed_date, default: "2004-01-01"
+    t.datetime :fixed_time, default: "2004-01-01 00:00:00"
+    t.column :char1, "char(1)", default: "Y"
+    t.string :char2, limit: 50, default: "a varchar field"
+    if supports_default_expression?
+      t.binary :uuid, limit: 36, default: -> { "(uuid())" }
     end
   end
 
   create_table :binary_fields, force: true do |t|
     t.binary :var_binary, limit: 255
     t.binary :var_binary_large, limit: 4095
+
     t.tinyblob   :tiny_blob
     t.blob       :normal_blob
     t.mediumblob :medium_blob
@@ -18,51 +37,46 @@ ActiveRecord::Schema.define do
     t.mediumtext :medium_text
     t.longtext   :long_text
 
+    t.binary :tiny_blob_2, size: :tiny
+    t.binary :medium_blob_2, size: :medium
+    t.binary :long_blob_2, size: :long
+    t.text :tiny_text_2, size: :tiny
+    t.text :medium_text_2, size: :medium
+    t.text :long_text_2, size: :long
+
     t.index :var_binary
   end
 
-  create_table :key_tests, force: true, options: 'ENGINE=MyISAM' do |t|
+  create_table :key_tests, force: true do |t|
     t.string :awesome
     t.string :pizza
     t.string :snacks
-    t.index :awesome, type: :fulltext, name: 'index_key_tests_on_awesome'
-    t.index :pizza, using: :btree, name: 'index_key_tests_on_pizza'
-    t.index :snacks, name: 'index_key_tests_on_snack'
+    t.index :awesome, type: :fulltext, name: "index_key_tests_on_awesome"
+    t.index :pizza, using: :btree, name: "index_key_tests_on_pizza"
+    t.index :snacks, name: "index_key_tests_on_snack"
   end
 
   create_table :collation_tests, id: false, force: true do |t|
-    t.string :string_cs_column, limit: 1, collation: 'utf8_bin'
-    t.string :string_ci_column, limit: 1, collation: 'utf8_general_ci'
+    t.string :string_cs_column, limit: 1, collation: "utf8mb4_bin"
+    t.string :string_ci_column, limit: 1, collation: "utf8mb4_general_ci"
     t.binary :binary_column,    limit: 1
   end
 
-  ActiveRecord::Base.connection.execute <<-SQL
-DROP PROCEDURE IF EXISTS ten;
-SQL
-
-  ActiveRecord::Base.connection.execute <<-SQL
-CREATE PROCEDURE ten() SQL SECURITY INVOKER
-BEGIN
-	select 10;
-END
-SQL
-
-  ActiveRecord::Base.connection.execute <<-SQL
-DROP PROCEDURE IF EXISTS topics;
-SQL
+  execute "DROP PROCEDURE IF EXISTS ten"
 
-  ActiveRecord::Base.connection.execute <<-SQL
-CREATE PROCEDURE topics(IN num INT) SQL SECURITY INVOKER
-BEGIN
-  select * from topics limit num;
-END
-SQL
+  execute <<~SQL
+    CREATE PROCEDURE ten() SQL SECURITY INVOKER
+    BEGIN
+      SELECT 10;
+    END
+  SQL
 
-  ActiveRecord::Base.connection.drop_table "enum_tests", if_exists: true
+  execute "DROP PROCEDURE IF EXISTS topics"
 
-  ActiveRecord::Base.connection.execute <<-SQL
-CREATE TABLE enum_tests (
-  enum_column ENUM('text','blob','tiny','medium','long','unsigned','bigint')
-)
-SQL
+  execute <<~SQL
+    CREATE PROCEDURE topics(IN num INT) SQL SECURITY INVOKER
+    BEGIN
+      SELECT * FROM topics LIMIT num;
+    END
+  SQL
 end

data/test/schema/oracle_specific_schema.rb

@@ -1,28 +1,27 @@
-ActiveRecord::Schema.define do
+# frozen_string_literal: true
 
+ActiveRecord::Schema.define do
   execute "drop table test_oracle_defaults" rescue nil
   execute "drop sequence test_oracle_defaults_seq" rescue nil
   execute "drop sequence companies_nonstd_seq" rescue nil
   execute "drop table defaults" rescue nil
   execute "drop sequence defaults_seq" rescue nil
 
-  execute <<-SQL
-create table test_oracle_defaults (
-  id integer not null primary key,
-  test_char char(1) default 'X' not null,
-  test_string varchar2(20) default 'hello' not null,
-  test_int integer default 3 not null
-)
+  execute <<~SQL
+    create table test_oracle_defaults (
+      id integer not null primary key,
+      test_char char(1) default 'X' not null,
+      test_string varchar2(20) default 'hello' not null,
+      test_int integer default 3 not null
+    )
   SQL
 
-  execute <<-SQL
-create sequence test_oracle_defaults_seq minvalue 10000
-  SQL
+  execute "create sequence test_oracle_defaults_seq minvalue 10000"
 
   execute "create sequence companies_nonstd_seq minvalue 10000"
 
-  execute <<-SQL
-  CREATE TABLE defaults (
+  execute <<~SQL
+    CREATE TABLE defaults (
       id integer not null,
       modified_date date default sysdate,
       modified_date_function date default sysdate,
@@ -33,8 +32,7 @@ create sequence test_oracle_defaults_seq minvalue 10000
       char1 varchar2(1) default 'Y',
       char2 varchar2(50) default 'a varchar field',
       char3 clob default 'a text field'
-  )
+    )
   SQL
   execute "create sequence defaults_seq minvalue 10000"
-
 end

data/test/schema/postgresql_specific_schema.rb

@@ -1,63 +1,60 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
+  enable_extension!("uuid-ossp", ActiveRecord::Base.connection)
+  enable_extension!("pgcrypto",  ActiveRecord::Base.connection) if ActiveRecord::Base.connection.supports_pgcrypto_uuid?
 
-  enable_extension!('uuid-ossp', ActiveRecord::Base.connection)
+  uuid_default = connection.supports_pgcrypto_uuid? ? {} : { default: "uuid_generate_v4()" }
 
-  create_table :uuid_parents, id: :uuid, force: true do |t|
+  create_table :uuid_parents, id: :uuid, force: true, **uuid_default do |t|
     t.string :name
   end
 
-  create_table :uuid_children, id: :uuid, force: true do |t|
+  create_table :uuid_children, id: :uuid, force: true, **uuid_default do |t|
     t.string :name
     t.uuid :uuid_parent_id
   end
 
   create_table :defaults, force: true do |t|
-    t.date :modified_date, default: -> { 'CURRENT_DATE' }
-    t.date :modified_date_function, default: -> { 'now()' }
-    t.date :fixed_date, default: '2004-01-01'
-    t.datetime :modified_time, default: -> { 'CURRENT_TIMESTAMP' }
-    t.datetime :modified_time_function, default: -> { 'now()' }
-    t.datetime :fixed_time, default: '2004-01-01 00:00:00.000000-00'
-    t.column :char1, 'char(1)', default: 'Y'
-    t.string :char2, limit: 50, default: 'a varchar field'
-    t.text :char3, default: 'a text field'
-    t.bigint :bigint_default, default: -> { '0::bigint' }
-    t.text :multiline_default, default: '--- []
-
-'
+    t.date :modified_date, default: -> { "CURRENT_DATE" }
+    t.date :modified_date_function, default: -> { "now()" }
+    t.date :fixed_date, default: "2004-01-01"
+    t.datetime :modified_time, default: -> { "CURRENT_TIMESTAMP" }
+    t.datetime :modified_time_function, default: -> { "now()" }
+    t.datetime :fixed_time, default: "2004-01-01 00:00:00.000000-00"
+    t.column :char1, "char(1)", default: "Y"
+    t.string :char2, limit: 50, default: "a varchar field"
+    t.text :char3, default: "a text field"
+    t.bigint :bigint_default, default: -> { "0::bigint" }
+    t.text :multiline_default, default: "--- []
+
+"
+  end
+
+  create_table :postgresql_times, force: true do |t|
+    t.interval :time_interval
+    t.interval :scaled_time_interval, precision: 6
   end
 
-  %w(postgresql_times postgresql_oids postgresql_timestamp_with_zones
-      postgresql_partitioned_table postgresql_partitioned_table_parent).each do |table_name|
-    drop_table table_name, if_exists: true
+  create_table :postgresql_oids, force: true do |t|
+    t.oid :obj_id
   end
 
-  execute 'DROP SEQUENCE IF EXISTS companies_nonstd_seq CASCADE'
-  execute 'CREATE SEQUENCE companies_nonstd_seq START 101 OWNED BY companies.id'
+  drop_table "postgresql_timestamp_with_zones", if_exists: true
+  drop_table "postgresql_partitioned_table", if_exists: true
+  drop_table "postgresql_partitioned_table_parent", if_exists: true
+
+  execute "DROP SEQUENCE IF EXISTS companies_nonstd_seq CASCADE"
+  execute "CREATE SEQUENCE companies_nonstd_seq START 101 OWNED BY companies.id"
   execute "ALTER TABLE companies ALTER COLUMN id SET DEFAULT nextval('companies_nonstd_seq')"
-  execute 'DROP SEQUENCE IF EXISTS companies_id_seq'
+  execute "DROP SEQUENCE IF EXISTS companies_id_seq"
 
-  execute 'DROP FUNCTION IF EXISTS partitioned_insert_trigger()'
+  execute "DROP FUNCTION IF EXISTS partitioned_insert_trigger()"
 
   %w(accounts_id_seq developers_id_seq projects_id_seq topics_id_seq customers_id_seq orders_id_seq).each do |seq_name|
     execute "SELECT setval('#{seq_name}', 100)"
   end
 
-  execute <<_SQL
-  CREATE TABLE postgresql_times (
-    id SERIAL PRIMARY KEY,
-    time_interval INTERVAL,
-    scaled_time_interval INTERVAL(6)
-  );
-_SQL
-
-  execute <<_SQL
-  CREATE TABLE postgresql_oids (
-    id SERIAL PRIMARY KEY,
-    obj_id OID
-  );
-_SQL
-
   execute <<_SQL
   CREATE TABLE postgresql_timestamp_with_zones (
     id SERIAL PRIMARY KEY,
@@ -88,7 +85,7 @@ _SQL
       FOR EACH ROW EXECUTE PROCEDURE partitioned_insert_trigger();
 _SQL
   rescue ActiveRecord::StatementInvalid => e
-    if e.message =~ /language "plpgsql" does not exist/
+    if e.message.include?('language "plpgsql" does not exist')
       execute "CREATE LANGUAGE 'plpgsql';"
       retry
     else
@@ -108,7 +105,21 @@ _SQL
   end
 
   create_table :uuid_items, force: true, id: false do |t|
-    t.uuid :uuid, primary_key: true
+    t.uuid :uuid, primary_key: true, **uuid_default
     t.string :title
   end
+
+  if supports_partitioned_indexes?
+    create_table(:measurements, id: false, force: true, options: "PARTITION BY LIST (city_id)") do |t|
+      t.string :city_id, null: false
+      t.date :logdate, null: false
+      t.integer :peaktemp
+      t.integer :unitsales
+      t.index [:logdate, :city_id], unique: true
+    end
+    create_table(:measurements_toronto, id: false, force: true,
+                                        options: "PARTITION OF measurements FOR VALUES IN (1)")
+    create_table(:measurements_concepcion, id: false, force: true,
+                                           options: "PARTITION OF measurements FOR VALUES IN (2)")
+  end
 end