mirror of
https://github.com/internetee/registry.git
synced 2025-06-04 11:47:30 +02:00
resolve structure conflict
This commit is contained in:
parent
f6e46b8fe6
commit
d56c61bf84
7 changed files with 106 additions and 10 deletions
6
db/migrate/20210729131100_add_field_to_user.rb
Normal file
6
db/migrate/20210729131100_add_field_to_user.rb
Normal file
|
@ -0,0 +1,6 @@
|
|||
class AddFieldToUser < ActiveRecord::Migration[6.1]
|
||||
def change
|
||||
add_column :users, :accreditation_date, :datetime
|
||||
add_column :users, :accreditation_expire_date, :datetime
|
||||
end
|
||||
end
|
5
db/migrate/20210729134625_add_column_to_user.rb
Normal file
5
db/migrate/20210729134625_add_column_to_user.rb
Normal file
|
@ -0,0 +1,5 @@
|
|||
class AddColumnToUser < ActiveRecord::Migration[6.1]
|
||||
def change
|
||||
add_column :users, :uuid, :uuid, default: 'gen_random_uuid()'
|
||||
end
|
||||
end
|
|
@ -2582,7 +2582,10 @@ CREATE TABLE public.users (
|
|||
remember_created_at timestamp without time zone,
|
||||
failed_attempts integer DEFAULT 0 NOT NULL,
|
||||
locked_at timestamp without time zone,
|
||||
legacy_id integer
|
||||
legacy_id integer,
|
||||
accreditation_date timestamp without time zone,
|
||||
accreditation_expire_date timestamp without time zone,
|
||||
uuid uuid DEFAULT public.gen_random_uuid()
|
||||
);
|
||||
|
||||
|
||||
|
@ -5230,6 +5233,6 @@ INSERT INTO "schema_migrations" (version) VALUES
|
|||
('20210616112332'),
|
||||
('20210629074044'),
|
||||
('20210628090353'),
|
||||
('20210708131814');
|
||||
|
||||
|
||||
('20210708131814'),
|
||||
('20210729131100'),
|
||||
('20210729134625');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue