iry 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 592290e30f1db830217241ebde319fbf952ee459ac05c3bc1e87b4b47a73e143
-  data.tar.gz: '09cabb7faf8e78a91e7d2443bdfd5466d7e8f63bc90fcfeb2abdb72f93bd79bf'
+  metadata.gz: 7ba546c69426b3b1d4c530d79ed5cfed56b5f3ea5dfe629a37b5061a90213b33
+  data.tar.gz: 65aa3e75c36b7fae90d81e20126c0bc134ff16ee7ddc009349754cd17cc14c29
 SHA512:
-  metadata.gz: 915d87f39809daa1a0a76ea66c4718e20afe6dbef4ced1853df47e9457927a464a06204cd4c0abd71dad861d8df6f23c974b2a75796ff7136b17f94875fb36ae
-  data.tar.gz: f8b10f525eab24f478a3bb6ee2c1039258b65d532eb5475d584f68bec23cf6c2e305e47033b4621dfe49be563da584c488683905d12c9abf529c07ec194d46bc
+  metadata.gz: ef79029f7a9f7a51dbb20964ad407ea146417a10de1c7c4d9149a9d83acece6e9db2abe2f3ca6779c684e31554bea9e22e6496579b5cc16eaf53ec787d6b4d17
+  data.tar.gz: a7daca1aca5c175224affa28884e83c19fcdfd4b01369c8b28f6cea2cfd5cea476fca77d433eb84fa53518a3812c03bc12448617bbd2a104b49dcaec1757cf44

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/db/schema.pgsql

@@ -3,14 +3,27 @@ create extension if not exists "btree_gist";
 
 create table if not exists users (
 	id uuid primary key default gen_random_uuid(),
-  unique_text text unique not null default gen_random_uuid()::text check (unique_text != 'invalid'),
+  unique_text text not null default gen_random_uuid()::text,
   exclude_text text not null default gen_random_uuid()::text,
-	user_id uuid references users (id),
-  untracked_text text unique not null default gen_random_uuid()::text,
+	user_id uuid,
+  untracked_text text not null default gen_random_uuid()::text,
   free_text text not null default '',
-	friend_user_id uuid references users (id),
+	friend_user_id uuid,
 	created_at timestamp(6) not null,
 	updated_at timestamp(6) not null,
 	-- acts similar to unique constraint
 	exclude using gist (exclude_text with =)
 );
+
+create unique index if not exists
+	index_users_on_unique_text on users(unique_text);
+create unique index if not exists
+	index_users_on_untracked_text on users(untracked_text);
+alter table users
+	add constraint chk_rails_15df0d7772 check (unique_text != 'invalid');
+alter table users
+	add constraint fk_rails_6d0b8b3c2f
+		foreign key (user_id) references users(id);
+alter table users
+	add constraint fk_rails_d3f200176b
+		foreign key (friend_user_id) references users(id);

data/lib/iry/constraint/check.rb

@@ -6,7 +6,13 @@ module Iry
       # @param table_name [String]
       # @return [String]
       def self.infer_name(key, table_name)
-        "#{table_name}_#{key}_check"
+        # PostgreSQL convention:
+        # "#{table_name}_#{key}_check"
+        # Rails convention
+        id = "#{table_name}_#{key}_chk"
+        hashed_id = OpenSSL::Digest::SHA256.hexdigest(id)[0..9]
+
+        "chk_rails_#{hashed_id}"
       end
 
       # @return [Symbol]

data/lib/iry/constraint/foreign_key.rb

@@ -6,7 +6,17 @@ module Iry
       # @param table_name [String]
       # @return [String]
       def self.infer_name(keys, table_name)
-        "#{table_name}_#{keys.join("_")}_fkey"
+        if keys.size > 1
+          # PostgreSQL convention:
+          return "#{table_name}_#{keys.join("_")}_fkey"
+        end
+
+        # Rails convention:
+        column = keys.first
+        id = "#{table_name}_#{column}_fk"
+        hashed_id = OpenSSL::Digest::SHA256.hexdigest(id)[0..9]
+
+        "fk_rails_#{hashed_id}"
       end
 
       # @return [<Symbol>]

data/lib/iry/constraint/unique.rb

@@ -1,12 +1,32 @@
 module Iry
   module Constraint
     class Unique
+      MAX_INFER_NAME_BYTE_SIZE = 62
+
       # Infers the unique constraint name based on keys and table name
       # @param keys [<Symbol>]
       # @param table_name [String]
       # @return [String]
       def self.infer_name(keys, table_name)
-        "#{table_name}_#{keys.join("_")}_key"
+        # PostgreSQL convention:
+        # "#{table_name}_#{keys.join("_")}_key"
+
+        # Rails convention:
+        # index_trip_hikers_on_trip_id_and_hiker_card_id
+        # index_TABLENAME_on_COLUMN1_and_COLUMN2
+        name = "index_#{table_name}_on_#{keys.join("_and_")}"
+        if name.bytesize <= MAX_INFER_NAME_BYTE_SIZE
+          return name
+        end
+
+        digest = OpenSSL::Digest::SHA256.hexdigest(name)[0..9]
+        hashed_id = "_#{digest}"
+        name = "idx_on_#{keys.join("_")}"
+
+        short_limit = max_index_name_size - hashed_identifier.bytesize
+        short_name = name.mb_chars.limit(short_limit).to_s
+
+        "#{short_name}#{hashed_identifier}"
       end
 
       # @return [<Symbol>]

data/lib/iry.rb

@@ -1,4 +1,5 @@
 require "active_record"
+require "openssl"
 
 require_relative "iry/version"
 require_relative "iry/handlers"

data/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "iry",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "iry",
-      "version": "0.6.0",
+      "version": "0.7.0",
       "license": "MIT",
       "devDependencies": {
         "conventional-changelog-cli": ">= 3.0.0",

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iry",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Transform database constraint errors into activerecord validation errors",
   "private": true,
   "main": "index.js",

data/rbi/iry.rbi

@@ -426,6 +426,8 @@ module Iry
     end
 
     class Unique
+      MAX_INFER_NAME_BYTE_SIZE = T.let(62, T.untyped)
+
       # Infers the unique constraint name based on keys and table name
       # 
       # _@param_ `keys`

data/sig/iry.rbs

@@ -370,6 +370,8 @@ module Iry
     end
 
     class Unique
+      MAX_INFER_NAME_BYTE_SIZE: untyped
+
       # Infers the unique constraint name based on keys and table name
       # 
       # _@param_ `keys`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iry
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Francesco Belladonna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord