diff --git a/build.gradle b/build.gradle index 1c9d3397c..55d779a5a 100644 --- a/build.gradle +++ b/build.gradle @@ -86,8 +86,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-cache' implementation 'com.github.ben-manes.caffeine:caffeine' - testCompile 'org.springframework.boot:spring-boot-starter-test' - testCompile 'org.flywaydb.flyway-test-extensions:flyway-spring-test:6.1.0' + testImplementation'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.flywaydb.flyway-test-extensions:flyway-spring-test:6.1.0' } diff --git a/project-properties.gradle b/project-properties.gradle index d25de2299..01c569094 100755 --- a/project-properties.gradle +++ b/project-properties.gradle @@ -80,11 +80,9 @@ project.ext { (migrationsUrl + '/migrations/76_user_bid_extension.up.sql') : 'V076__user_bid_extension.sql', (migrationsUrl + '/migrations/77_email_server_documentation_link.up.sql') : 'V077__email_server_documentation_link.sql', (migrationsUrl + '/migrations/78_drop_redundant_index.up.sql') : 'V078__drop_redundant_index.sql', - (migrationsUrl + '/migrations/83_add_slugify_function.up.sql') : 'V083__add_slugify_function.sql', - (migrationsUrl + '/migrations/84_organization_tables.up.sql') : 'V084__organization_tables.sql', - (migrationsUrl + '/migrations/86_notication_update.up.sql') : 'V086__notication_update.sql', - (migrationsUrl + '/migrations/88_add_retention_policy_launch.up.sql') : 'V088__add_retention_policy_launch.sql', - (migrationsUrl + '/migrations/90_analytics_data_table.up.sql') : 'V090__analytics_data_table.sql', + (migrationsUrl + '/migrations/84_notication_update.up.sql') : 'V084__notication_update.sql', + (migrationsUrl + '/migrations/86_add_retention_policy_launch.up.sql') : 'V086__add_retention_policy_launch.sql', + (migrationsUrl + '/migrations/88_analytics_data_table.up.sql') : 'V088__analytics_data_table.sql', ] excludeTests = [ diff --git a/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java b/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java index 0ee7f7402..239e99ceb 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Indexes.java @@ -35,8 +35,6 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationRestriction; import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationScope; import com.epam.ta.reportportal.jooq.tables.JOnboarding; -import com.epam.ta.reportportal.jooq.tables.JOrganization; -import com.epam.ta.reportportal.jooq.tables.JOrganizationUser; import com.epam.ta.reportportal.jooq.tables.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -159,12 +157,6 @@ public class Indexes { public static final Index OAUTH_REGISTRATION_SCOPE_PK = Indexes0.OAUTH_REGISTRATION_SCOPE_PK; public static final Index OAUTH_REGISTRATION_SCOPE_UNIQUE = Indexes0.OAUTH_REGISTRATION_SCOPE_UNIQUE; public static final Index ONBOARDING_PK = Indexes0.ONBOARDING_PK; - public static final Index ORGANIZATION_EXTERNAL_ID_KEY = Indexes0.ORGANIZATION_EXTERNAL_ID_KEY; - public static final Index ORGANIZATION_NAME_KEY = Indexes0.ORGANIZATION_NAME_KEY; - public static final Index ORGANIZATION_PKEY = Indexes0.ORGANIZATION_PKEY; - public static final Index ORGANIZATION_SLUG_IDX = Indexes0.ORGANIZATION_SLUG_IDX; - public static final Index ORGANIZATION_SLUG_KEY = Indexes0.ORGANIZATION_SLUG_KEY; - public static final Index ORGANIZATION_USER_PK = Indexes0.ORGANIZATION_USER_PK; public static final Index SHAREABLE_PK = Indexes0.SHAREABLE_PK; public static final Index SHARED_ENTITY_OWNERX = Indexes0.SHARED_ENTITY_OWNERX; public static final Index SHARED_ENTITY_PROJECT_IDX = Indexes0.SHARED_ENTITY_PROJECT_IDX; @@ -173,8 +165,6 @@ public class Indexes { public static final Index UNQ_NAME_PROJECTID = Indexes0.UNQ_NAME_PROJECTID; public static final Index PATTERN_ITEM_ITEM_ID_IDX = Indexes0.PATTERN_ITEM_ITEM_ID_IDX; public static final Index PATTERN_ITEM_UNQ = Indexes0.PATTERN_ITEM_UNQ; - public static final Index PROJECT_KEY_IDX = Indexes0.PROJECT_KEY_IDX; - public static final Index PROJECT_KEY_KEY = Indexes0.PROJECT_KEY_KEY; public static final Index PROJECT_NAME_KEY = Indexes0.PROJECT_NAME_KEY; public static final Index PROJECT_PK = Indexes0.PROJECT_PK; public static final Index UNIQUE_ATTRIBUTE_PER_PROJECT = Indexes0.UNIQUE_ATTRIBUTE_PER_PROJECT; @@ -299,12 +289,6 @@ private static class Indexes0 { public static Index OAUTH_REGISTRATION_SCOPE_PK = Internal.createIndex("oauth_registration_scope_pk", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, new OrderField[] { JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.ID }, true); public static Index OAUTH_REGISTRATION_SCOPE_UNIQUE = Internal.createIndex("oauth_registration_scope_unique", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, new OrderField[] { JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.SCOPE, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.OAUTH_REGISTRATION_FK }, true); public static Index ONBOARDING_PK = Internal.createIndex("onboarding_pk", JOnboarding.ONBOARDING, new OrderField[] { JOnboarding.ONBOARDING.ID }, true); - public static Index ORGANIZATION_EXTERNAL_ID_KEY = Internal.createIndex("organization_external_id_key", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.EXTERNAL_ID }, true); - public static Index ORGANIZATION_NAME_KEY = Internal.createIndex("organization_name_key", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.NAME }, true); - public static Index ORGANIZATION_PKEY = Internal.createIndex("organization_pkey", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.ID }, true); - public static Index ORGANIZATION_SLUG_IDX = Internal.createIndex("organization_slug_idx", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.SLUG }, false); - public static Index ORGANIZATION_SLUG_KEY = Internal.createIndex("organization_slug_key", JOrganization.ORGANIZATION, new OrderField[] { JOrganization.ORGANIZATION.SLUG }, true); - public static Index ORGANIZATION_USER_PK = Internal.createIndex("organization_user_pk", JOrganizationUser.ORGANIZATION_USER, new OrderField[] { JOrganizationUser.ORGANIZATION_USER.USER_ID, JOrganizationUser.ORGANIZATION_USER.ORGANIZATION_ID }, true); public static Index SHAREABLE_PK = Internal.createIndex("shareable_pk", JOwnedEntity.OWNED_ENTITY, new OrderField[] { JOwnedEntity.OWNED_ENTITY.ID }, true); public static Index SHARED_ENTITY_OWNERX = Internal.createIndex("shared_entity_ownerx", JOwnedEntity.OWNED_ENTITY, new OrderField[] { JOwnedEntity.OWNED_ENTITY.OWNER }, false); public static Index SHARED_ENTITY_PROJECT_IDX = Internal.createIndex("shared_entity_project_idx", JOwnedEntity.OWNED_ENTITY, new OrderField[] { JOwnedEntity.OWNED_ENTITY.PROJECT_ID }, false); @@ -313,8 +297,6 @@ private static class Indexes0 { public static Index UNQ_NAME_PROJECTID = Internal.createIndex("unq_name_projectid", JPatternTemplate.PATTERN_TEMPLATE, new OrderField[] { JPatternTemplate.PATTERN_TEMPLATE.NAME, JPatternTemplate.PATTERN_TEMPLATE.PROJECT_ID }, true); public static Index PATTERN_ITEM_ITEM_ID_IDX = Internal.createIndex("pattern_item_item_id_idx", JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM, new OrderField[] { JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.ITEM_ID }, false); public static Index PATTERN_ITEM_UNQ = Internal.createIndex("pattern_item_unq", JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM, new OrderField[] { JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.PATTERN_ID, JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.ITEM_ID }, true); - public static Index PROJECT_KEY_IDX = Internal.createIndex("project_key_idx", JProject.PROJECT, new OrderField[] { JProject.PROJECT.KEY }, false); - public static Index PROJECT_KEY_KEY = Internal.createIndex("project_key_key", JProject.PROJECT, new OrderField[] { JProject.PROJECT.KEY }, true); public static Index PROJECT_NAME_KEY = Internal.createIndex("project_name_key", JProject.PROJECT, new OrderField[] { JProject.PROJECT.NAME }, true); public static Index PROJECT_PK = Internal.createIndex("project_pk", JProject.PROJECT, new OrderField[] { JProject.PROJECT.ID }, true); public static Index UNIQUE_ATTRIBUTE_PER_PROJECT = Internal.createIndex("unique_attribute_per_project", JProjectAttribute.PROJECT_ATTRIBUTE, new OrderField[] { JProjectAttribute.PROJECT_ATTRIBUTE.ATTRIBUTE_ID, JProjectAttribute.PROJECT_ATTRIBUTE.PROJECT_ID }, true); diff --git a/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java b/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java index d506f663a..9ebc78eb5 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/JPublic.java @@ -35,8 +35,6 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationRestriction; import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationScope; import com.epam.ta.reportportal.jooq.tables.JOnboarding; -import com.epam.ta.reportportal.jooq.tables.JOrganization; -import com.epam.ta.reportportal.jooq.tables.JOrganizationUser; import com.epam.ta.reportportal.jooq.tables.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -91,7 +89,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JPublic extends SchemaImpl { - private static final long serialVersionUID = 846466812; + private static final long serialVersionUID = 259756826; /** * The reference instance of public @@ -253,16 +251,6 @@ public class JPublic extends SchemaImpl { */ public final JOnboarding ONBOARDING = com.epam.ta.reportportal.jooq.tables.JOnboarding.ONBOARDING; - /** - * The table public.organization. - */ - public final JOrganization ORGANIZATION = com.epam.ta.reportportal.jooq.tables.JOrganization.ORGANIZATION; - - /** - * The table public.organization_user. - */ - public final JOrganizationUser ORGANIZATION_USER = com.epam.ta.reportportal.jooq.tables.JOrganizationUser.ORGANIZATION_USER; - /** * The table public.owned_entity. */ @@ -446,8 +434,6 @@ private final List> getSequences0() { Sequences.OAUTH_REGISTRATION_RESTRICTION_ID_SEQ, Sequences.OAUTH_REGISTRATION_SCOPE_ID_SEQ, Sequences.ONBOARDING_ID_SEQ, - Sequences.ORGANIZATION_ID_SEQ, - Sequences.ORGANIZATION_USER_USER_ID_SEQ, Sequences.PATTERN_TEMPLATE_ID_SEQ, Sequences.PROJECT_ATTRIBUTE_ATTRIBUTE_ID_SEQ, Sequences.PROJECT_ATTRIBUTE_PROJECT_ID_SEQ, @@ -505,8 +491,6 @@ private final List> getTables0() { JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, JOnboarding.ONBOARDING, - JOrganization.ORGANIZATION, - JOrganizationUser.ORGANIZATION_USER, JOwnedEntity.OWNED_ENTITY, JParameter.PARAMETER, JPatternTemplate.PATTERN_TEMPLATE, diff --git a/src/main/java/com/epam/ta/reportportal/jooq/Keys.java b/src/main/java/com/epam/ta/reportportal/jooq/Keys.java index 28e54acf9..fca202dc2 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Keys.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Keys.java @@ -35,8 +35,6 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationRestriction; import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationScope; import com.epam.ta.reportportal.jooq.tables.JOnboarding; -import com.epam.ta.reportportal.jooq.tables.JOrganization; -import com.epam.ta.reportportal.jooq.tables.JOrganizationUser; import com.epam.ta.reportportal.jooq.tables.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -91,8 +89,6 @@ import com.epam.ta.reportportal.jooq.tables.records.JOauthRegistrationRestrictionRecord; import com.epam.ta.reportportal.jooq.tables.records.JOauthRegistrationScopeRecord; import com.epam.ta.reportportal.jooq.tables.records.JOnboardingRecord; -import com.epam.ta.reportportal.jooq.tables.records.JOrganizationRecord; -import com.epam.ta.reportportal.jooq.tables.records.JOrganizationUserRecord; import com.epam.ta.reportportal.jooq.tables.records.JOwnedEntityRecord; import com.epam.ta.reportportal.jooq.tables.records.JParameterRecord; import com.epam.ta.reportportal.jooq.tables.records.JPatternTemplateRecord; @@ -163,8 +159,6 @@ public class Keys { public static final Identity IDENTITY_OAUTH_REGISTRATION_RESTRICTION = Identities0.IDENTITY_OAUTH_REGISTRATION_RESTRICTION; public static final Identity IDENTITY_OAUTH_REGISTRATION_SCOPE = Identities0.IDENTITY_OAUTH_REGISTRATION_SCOPE; public static final Identity IDENTITY_ONBOARDING = Identities0.IDENTITY_ONBOARDING; - public static final Identity IDENTITY_ORGANIZATION = Identities0.IDENTITY_ORGANIZATION; - public static final Identity IDENTITY_ORGANIZATION_USER = Identities0.IDENTITY_ORGANIZATION_USER; public static final Identity IDENTITY_OWNED_ENTITY = Identities0.IDENTITY_OWNED_ENTITY; public static final Identity IDENTITY_PATTERN_TEMPLATE = Identities0.IDENTITY_PATTERN_TEMPLATE; public static final Identity IDENTITY_PROJECT = Identities0.IDENTITY_PROJECT; @@ -223,18 +217,12 @@ public class Keys { public static final UniqueKey OAUTH_REGISTRATION_SCOPE_PK = UniqueKeys0.OAUTH_REGISTRATION_SCOPE_PK; public static final UniqueKey OAUTH_REGISTRATION_SCOPE_UNIQUE = UniqueKeys0.OAUTH_REGISTRATION_SCOPE_UNIQUE; public static final UniqueKey ONBOARDING_PK = UniqueKeys0.ONBOARDING_PK; - public static final UniqueKey ORGANIZATION_PKEY = UniqueKeys0.ORGANIZATION_PKEY; - public static final UniqueKey ORGANIZATION_NAME_KEY = UniqueKeys0.ORGANIZATION_NAME_KEY; - public static final UniqueKey ORGANIZATION_EXTERNAL_ID_KEY = UniqueKeys0.ORGANIZATION_EXTERNAL_ID_KEY; - public static final UniqueKey ORGANIZATION_SLUG_KEY = UniqueKeys0.ORGANIZATION_SLUG_KEY; - public static final UniqueKey ORGANIZATION_USER_PK = UniqueKeys0.ORGANIZATION_USER_PK; public static final UniqueKey SHAREABLE_PK = UniqueKeys0.SHAREABLE_PK; public static final UniqueKey PATTERN_TEMPLATE_PK = UniqueKeys0.PATTERN_TEMPLATE_PK; public static final UniqueKey UNQ_NAME_PROJECTID = UniqueKeys0.UNQ_NAME_PROJECTID; public static final UniqueKey PATTERN_ITEM_UNQ = UniqueKeys0.PATTERN_ITEM_UNQ; public static final UniqueKey PROJECT_PK = UniqueKeys0.PROJECT_PK; public static final UniqueKey PROJECT_NAME_KEY = UniqueKeys0.PROJECT_NAME_KEY; - public static final UniqueKey PROJECT_KEY_KEY = UniqueKeys0.PROJECT_KEY_KEY; public static final UniqueKey UNIQUE_ATTRIBUTE_PER_PROJECT = UniqueKeys0.UNIQUE_ATTRIBUTE_PER_PROJECT; public static final UniqueKey USERS_PROJECT_PK = UniqueKeys0.USERS_PROJECT_PK; public static final UniqueKey RESTORE_PASSWORD_BID_PK = UniqueKeys0.RESTORE_PASSWORD_BID_PK; @@ -297,8 +285,6 @@ public class Keys { public static final ForeignKey LOG__LOG_ATTACHMENT_ID_FKEY = ForeignKeys0.LOG__LOG_ATTACHMENT_ID_FKEY; public static final ForeignKey OAUTH_REGISTRATION_RESTRICTION__OAUTH_REGISTRATION_RESTRICTION_OAUTH_REGISTRATION_FK_FKEY = ForeignKeys0.OAUTH_REGISTRATION_RESTRICTION__OAUTH_REGISTRATION_RESTRICTION_OAUTH_REGISTRATION_FK_FKEY; public static final ForeignKey OAUTH_REGISTRATION_SCOPE__OAUTH_REGISTRATION_SCOPE_OAUTH_REGISTRATION_FK_FKEY = ForeignKeys0.OAUTH_REGISTRATION_SCOPE__OAUTH_REGISTRATION_SCOPE_OAUTH_REGISTRATION_FK_FKEY; - public static final ForeignKey ORGANIZATION_USER__ORGANIZATION_USER_USER_ID_FKEY = ForeignKeys0.ORGANIZATION_USER__ORGANIZATION_USER_USER_ID_FKEY; - public static final ForeignKey ORGANIZATION_USER__ORGANIZATION_USER_ORGANIZATION_ID_FKEY = ForeignKeys0.ORGANIZATION_USER__ORGANIZATION_USER_ORGANIZATION_ID_FKEY; public static final ForeignKey OWNED_ENTITY__SHAREABLE_ENTITY_PROJECT_ID_FKEY = ForeignKeys0.OWNED_ENTITY__SHAREABLE_ENTITY_PROJECT_ID_FKEY; public static final ForeignKey PARAMETER__PARAMETER_ITEM_ID_FKEY = ForeignKeys0.PARAMETER__PARAMETER_ITEM_ID_FKEY; public static final ForeignKey PATTERN_TEMPLATE__PATTERN_TEMPLATE_PROJECT_ID_FKEY = ForeignKeys0.PATTERN_TEMPLATE__PATTERN_TEMPLATE_PROJECT_ID_FKEY; @@ -350,8 +336,6 @@ private static class Identities0 { public static Identity IDENTITY_OAUTH_REGISTRATION_RESTRICTION = Internal.createIdentity(JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION, JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.ID); public static Identity IDENTITY_OAUTH_REGISTRATION_SCOPE = Internal.createIdentity(JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.ID); public static Identity IDENTITY_ONBOARDING = Internal.createIdentity(JOnboarding.ONBOARDING, JOnboarding.ONBOARDING.ID); - public static Identity IDENTITY_ORGANIZATION = Internal.createIdentity(JOrganization.ORGANIZATION, JOrganization.ORGANIZATION.ID); - public static Identity IDENTITY_ORGANIZATION_USER = Internal.createIdentity(JOrganizationUser.ORGANIZATION_USER, JOrganizationUser.ORGANIZATION_USER.USER_ID); public static Identity IDENTITY_OWNED_ENTITY = Internal.createIdentity(JOwnedEntity.OWNED_ENTITY, JOwnedEntity.OWNED_ENTITY.ID); public static Identity IDENTITY_PATTERN_TEMPLATE = Internal.createIdentity(JPatternTemplate.PATTERN_TEMPLATE, JPatternTemplate.PATTERN_TEMPLATE.ID); public static Identity IDENTITY_PROJECT = Internal.createIdentity(JProject.PROJECT, JProject.PROJECT.ID); @@ -408,18 +392,12 @@ private static class UniqueKeys0 { public static final UniqueKey OAUTH_REGISTRATION_SCOPE_PK = Internal.createUniqueKey(JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, "oauth_registration_scope_pk", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.ID); public static final UniqueKey OAUTH_REGISTRATION_SCOPE_UNIQUE = Internal.createUniqueKey(JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, "oauth_registration_scope_unique", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.SCOPE, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.OAUTH_REGISTRATION_FK); public static final UniqueKey ONBOARDING_PK = Internal.createUniqueKey(JOnboarding.ONBOARDING, "onboarding_pk", JOnboarding.ONBOARDING.ID); - public static final UniqueKey ORGANIZATION_PKEY = Internal.createUniqueKey(JOrganization.ORGANIZATION, "organization_pkey", JOrganization.ORGANIZATION.ID); - public static final UniqueKey ORGANIZATION_NAME_KEY = Internal.createUniqueKey(JOrganization.ORGANIZATION, "organization_name_key", JOrganization.ORGANIZATION.NAME); - public static final UniqueKey ORGANIZATION_EXTERNAL_ID_KEY = Internal.createUniqueKey(JOrganization.ORGANIZATION, "organization_external_id_key", JOrganization.ORGANIZATION.EXTERNAL_ID); - public static final UniqueKey ORGANIZATION_SLUG_KEY = Internal.createUniqueKey(JOrganization.ORGANIZATION, "organization_slug_key", JOrganization.ORGANIZATION.SLUG); - public static final UniqueKey ORGANIZATION_USER_PK = Internal.createUniqueKey(JOrganizationUser.ORGANIZATION_USER, "organization_user_pk", JOrganizationUser.ORGANIZATION_USER.USER_ID, JOrganizationUser.ORGANIZATION_USER.ORGANIZATION_ID); public static final UniqueKey SHAREABLE_PK = Internal.createUniqueKey(JOwnedEntity.OWNED_ENTITY, "shareable_pk", JOwnedEntity.OWNED_ENTITY.ID); public static final UniqueKey PATTERN_TEMPLATE_PK = Internal.createUniqueKey(JPatternTemplate.PATTERN_TEMPLATE, "pattern_template_pk", JPatternTemplate.PATTERN_TEMPLATE.ID); public static final UniqueKey UNQ_NAME_PROJECTID = Internal.createUniqueKey(JPatternTemplate.PATTERN_TEMPLATE, "unq_name_projectid", JPatternTemplate.PATTERN_TEMPLATE.NAME, JPatternTemplate.PATTERN_TEMPLATE.PROJECT_ID); public static final UniqueKey PATTERN_ITEM_UNQ = Internal.createUniqueKey(JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM, "pattern_item_unq", JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.PATTERN_ID, JPatternTemplateTestItem.PATTERN_TEMPLATE_TEST_ITEM.ITEM_ID); public static final UniqueKey PROJECT_PK = Internal.createUniqueKey(JProject.PROJECT, "project_pk", JProject.PROJECT.ID); public static final UniqueKey PROJECT_NAME_KEY = Internal.createUniqueKey(JProject.PROJECT, "project_name_key", JProject.PROJECT.NAME); - public static final UniqueKey PROJECT_KEY_KEY = Internal.createUniqueKey(JProject.PROJECT, "project_key_key", JProject.PROJECT.KEY); public static final UniqueKey UNIQUE_ATTRIBUTE_PER_PROJECT = Internal.createUniqueKey(JProjectAttribute.PROJECT_ATTRIBUTE, "unique_attribute_per_project", JProjectAttribute.PROJECT_ATTRIBUTE.ATTRIBUTE_ID, JProjectAttribute.PROJECT_ATTRIBUTE.PROJECT_ID); public static final UniqueKey USERS_PROJECT_PK = Internal.createUniqueKey(JProjectUser.PROJECT_USER, "users_project_pk", JProjectUser.PROJECT_USER.USER_ID, JProjectUser.PROJECT_USER.PROJECT_ID); public static final UniqueKey RESTORE_PASSWORD_BID_PK = Internal.createUniqueKey(JRestorePasswordBid.RESTORE_PASSWORD_BID, "restore_password_bid_pk", JRestorePasswordBid.RESTORE_PASSWORD_BID.UUID); @@ -480,8 +458,6 @@ private static class ForeignKeys0 { public static final ForeignKey LOG__LOG_ATTACHMENT_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.ATTACHMENT_PK, JLog.LOG, "log__log_attachment_id_fkey", JLog.LOG.ATTACHMENT_ID); public static final ForeignKey OAUTH_REGISTRATION_RESTRICTION__OAUTH_REGISTRATION_RESTRICTION_OAUTH_REGISTRATION_FK_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.OAUTH_REGISTRATION_PKEY, JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION, "oauth_registration_restriction__oauth_registration_restriction_oauth_registration_fk_fkey", JOauthRegistrationRestriction.OAUTH_REGISTRATION_RESTRICTION.OAUTH_REGISTRATION_FK); public static final ForeignKey OAUTH_REGISTRATION_SCOPE__OAUTH_REGISTRATION_SCOPE_OAUTH_REGISTRATION_FK_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.OAUTH_REGISTRATION_PKEY, JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE, "oauth_registration_scope__oauth_registration_scope_oauth_registration_fk_fkey", JOauthRegistrationScope.OAUTH_REGISTRATION_SCOPE.OAUTH_REGISTRATION_FK); - public static final ForeignKey ORGANIZATION_USER__ORGANIZATION_USER_USER_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.USERS_PK, JOrganizationUser.ORGANIZATION_USER, "organization_user__organization_user_user_id_fkey", JOrganizationUser.ORGANIZATION_USER.USER_ID); - public static final ForeignKey ORGANIZATION_USER__ORGANIZATION_USER_ORGANIZATION_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.ORGANIZATION_PKEY, JOrganizationUser.ORGANIZATION_USER, "organization_user__organization_user_organization_id_fkey", JOrganizationUser.ORGANIZATION_USER.ORGANIZATION_ID); public static final ForeignKey OWNED_ENTITY__SHAREABLE_ENTITY_PROJECT_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.PROJECT_PK, JOwnedEntity.OWNED_ENTITY, "owned_entity__shareable_entity_project_id_fkey", JOwnedEntity.OWNED_ENTITY.PROJECT_ID); public static final ForeignKey PARAMETER__PARAMETER_ITEM_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.TEST_ITEM_PK, JParameter.PARAMETER, "parameter__parameter_item_id_fkey", JParameter.PARAMETER.ITEM_ID); public static final ForeignKey PATTERN_TEMPLATE__PATTERN_TEMPLATE_PROJECT_ID_FKEY = Internal.createForeignKey(com.epam.ta.reportportal.jooq.Keys.PROJECT_PK, JPatternTemplate.PATTERN_TEMPLATE, "pattern_template__pattern_template_project_id_fkey", JPatternTemplate.PATTERN_TEMPLATE.PROJECT_ID); diff --git a/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java b/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java index e609623b8..384ea2c8c 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Sequences.java @@ -123,16 +123,6 @@ public class Sequences { */ public static final Sequence ONBOARDING_ID_SEQ = new SequenceImpl("onboarding_id_seq", JPublic.PUBLIC, org.jooq.impl.SQLDataType.SMALLINT.nullable(false)); - /** - * The sequence public.organization_id_seq - */ - public static final Sequence ORGANIZATION_ID_SEQ = new SequenceImpl("organization_id_seq", JPublic.PUBLIC, org.jooq.impl.SQLDataType.BIGINT.nullable(false)); - - /** - * The sequence public.organization_user_user_id_seq - */ - public static final Sequence ORGANIZATION_USER_USER_ID_SEQ = new SequenceImpl("organization_user_user_id_seq", JPublic.PUBLIC, org.jooq.impl.SQLDataType.BIGINT.nullable(false)); - /** * The sequence public.pattern_template_id_seq */ diff --git a/src/main/java/com/epam/ta/reportportal/jooq/Tables.java b/src/main/java/com/epam/ta/reportportal/jooq/Tables.java index 8ca679125..42565cb4d 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/Tables.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/Tables.java @@ -35,8 +35,6 @@ import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationRestriction; import com.epam.ta.reportportal.jooq.tables.JOauthRegistrationScope; import com.epam.ta.reportportal.jooq.tables.JOnboarding; -import com.epam.ta.reportportal.jooq.tables.JOrganization; -import com.epam.ta.reportportal.jooq.tables.JOrganizationUser; import com.epam.ta.reportportal.jooq.tables.JOwnedEntity; import com.epam.ta.reportportal.jooq.tables.JParameter; import com.epam.ta.reportportal.jooq.tables.JPatternTemplate; @@ -238,16 +236,6 @@ public class Tables { */ public static final JOnboarding ONBOARDING = JOnboarding.ONBOARDING; - /** - * The table public.organization. - */ - public static final JOrganization ORGANIZATION = JOrganization.ORGANIZATION; - - /** - * The table public.organization_user. - */ - public static final JOrganizationUser ORGANIZATION_USER = JOrganizationUser.ORGANIZATION_USER; - /** * The table public.owned_entity. */ diff --git a/src/main/java/com/epam/ta/reportportal/jooq/enums/JOrganizationRoleEnum.java b/src/main/java/com/epam/ta/reportportal/jooq/enums/JOrganizationRoleEnum.java deleted file mode 100644 index b49770127..000000000 --- a/src/main/java/com/epam/ta/reportportal/jooq/enums/JOrganizationRoleEnum.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package com.epam.ta.reportportal.jooq.enums; - - -import com.epam.ta.reportportal.jooq.JPublic; - -import javax.annotation.processing.Generated; - -import org.jooq.Catalog; -import org.jooq.EnumType; -import org.jooq.Schema; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.12.4" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public enum JOrganizationRoleEnum implements EnumType { - - MANAGER("MANAGER"), - - MEMBER("MEMBER"); - - private final String literal; - - private JOrganizationRoleEnum(String literal) { - this.literal = literal; - } - - @Override - public Catalog getCatalog() { - return getSchema() == null ? null : getSchema().getCatalog(); - } - - @Override - public Schema getSchema() { - return JPublic.PUBLIC; - } - - @Override - public String getName() { - return "organization_role_enum"; - } - - @Override - public String getLiteral() { - return literal; - } -} diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganization.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganization.java deleted file mode 100644 index 31d1787e7..000000000 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganization.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package com.epam.ta.reportportal.jooq.tables; - - -import com.epam.ta.reportportal.jooq.Indexes; -import com.epam.ta.reportportal.jooq.JPublic; -import com.epam.ta.reportportal.jooq.Keys; -import com.epam.ta.reportportal.jooq.tables.records.JOrganizationRecord; - -import java.sql.Timestamp; -import java.util.Arrays; -import java.util.List; - -import javax.annotation.processing.Generated; - -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Identity; -import org.jooq.Index; -import org.jooq.Name; -import org.jooq.Record; -import org.jooq.Row7; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.TableImpl; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.12.4" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JOrganization extends TableImpl { - - private static final long serialVersionUID = -1316883766; - - /** - * The reference instance of public.organization - */ - public static final JOrganization ORGANIZATION = new JOrganization(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return JOrganizationRecord.class; - } - - /** - * The column public.organization.id. - */ - public final TableField ID = createField(DSL.name("id"), org.jooq.impl.SQLDataType.BIGINT.nullable(false).defaultValue(org.jooq.impl.DSL.field("nextval('organization_id_seq'::regclass)", org.jooq.impl.SQLDataType.BIGINT)), this, ""); - - /** - * The column public.organization.created_at. - */ - public final TableField CREATED_AT = createField(DSL.name("created_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); - - /** - * The column public.organization.updated_at. - */ - public final TableField UPDATED_AT = createField(DSL.name("updated_at"), org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaultValue(org.jooq.impl.DSL.field("now()", org.jooq.impl.SQLDataType.TIMESTAMP)), this, ""); - - /** - * The column public.organization.name. - */ - public final TableField NAME = createField(DSL.name("name"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); - - /** - * The column public.organization.organization_type. - */ - public final TableField ORGANIZATION_TYPE = createField(DSL.name("organization_type"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); - - /** - * The column public.organization.external_id. - */ - public final TableField EXTERNAL_ID = createField(DSL.name("external_id"), org.jooq.impl.SQLDataType.CLOB, this, ""); - - /** - * The column public.organization.slug. - */ - public final TableField SLUG = createField(DSL.name("slug"), org.jooq.impl.SQLDataType.CLOB.nullable(false), this, ""); - - /** - * Create a public.organization table reference - */ - public JOrganization() { - this(DSL.name("organization"), null); - } - - /** - * Create an aliased public.organization table reference - */ - public JOrganization(String alias) { - this(DSL.name(alias), ORGANIZATION); - } - - /** - * Create an aliased public.organization table reference - */ - public JOrganization(Name alias) { - this(alias, ORGANIZATION); - } - - private JOrganization(Name alias, Table aliased) { - this(alias, aliased, null); - } - - private JOrganization(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment("")); - } - - public JOrganization(Table child, ForeignKey key) { - super(child, key, ORGANIZATION); - } - - @Override - public Schema getSchema() { - return JPublic.PUBLIC; - } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.ORGANIZATION_EXTERNAL_ID_KEY, Indexes.ORGANIZATION_NAME_KEY, Indexes.ORGANIZATION_PKEY, Indexes.ORGANIZATION_SLUG_IDX, Indexes.ORGANIZATION_SLUG_KEY); - } - - @Override - public Identity getIdentity() { - return Keys.IDENTITY_ORGANIZATION; - } - - @Override - public UniqueKey getPrimaryKey() { - return Keys.ORGANIZATION_PKEY; - } - - @Override - public List> getKeys() { - return Arrays.>asList(Keys.ORGANIZATION_PKEY, Keys.ORGANIZATION_NAME_KEY, Keys.ORGANIZATION_EXTERNAL_ID_KEY, Keys.ORGANIZATION_SLUG_KEY); - } - - @Override - public JOrganization as(String alias) { - return new JOrganization(DSL.name(alias), this); - } - - @Override - public JOrganization as(Name alias) { - return new JOrganization(alias, this); - } - - /** - * Rename this table - */ - @Override - public JOrganization rename(String name) { - return new JOrganization(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public JOrganization rename(Name name) { - return new JOrganization(name, null); - } - - // ------------------------------------------------------------------------- - // Row7 type methods - // ------------------------------------------------------------------------- - - @Override - public Row7 fieldsRow() { - return (Row7) super.fieldsRow(); - } -} diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganizationUser.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganizationUser.java deleted file mode 100644 index ba8a6bf94..000000000 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JOrganizationUser.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package com.epam.ta.reportportal.jooq.tables; - - -import com.epam.ta.reportportal.jooq.Indexes; -import com.epam.ta.reportportal.jooq.JPublic; -import com.epam.ta.reportportal.jooq.Keys; -import com.epam.ta.reportportal.jooq.enums.JOrganizationRoleEnum; -import com.epam.ta.reportportal.jooq.tables.records.JOrganizationUserRecord; - -import java.util.Arrays; -import java.util.List; - -import javax.annotation.processing.Generated; - -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Identity; -import org.jooq.Index; -import org.jooq.Name; -import org.jooq.Record; -import org.jooq.Row3; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.TableImpl; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.12.4" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JOrganizationUser extends TableImpl { - - private static final long serialVersionUID = -453434879; - - /** - * The reference instance of public.organization_user - */ - public static final JOrganizationUser ORGANIZATION_USER = new JOrganizationUser(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return JOrganizationUserRecord.class; - } - - /** - * The column public.organization_user.user_id. - */ - public final TableField USER_ID = createField(DSL.name("user_id"), org.jooq.impl.SQLDataType.BIGINT.nullable(false).defaultValue(org.jooq.impl.DSL.field("nextval('organization_user_user_id_seq'::regclass)", org.jooq.impl.SQLDataType.BIGINT)), this, ""); - - /** - * The column public.organization_user.organization_id. - */ - public final TableField ORGANIZATION_ID = createField(DSL.name("organization_id"), org.jooq.impl.SQLDataType.BIGINT.nullable(false), this, ""); - - /** - * The column public.organization_user.organization_role. - */ - public final TableField ORGANIZATION_ROLE = createField(DSL.name("organization_role"), org.jooq.impl.SQLDataType.VARCHAR.nullable(false).asEnumDataType(com.epam.ta.reportportal.jooq.enums.JOrganizationRoleEnum.class), this, ""); - - /** - * Create a public.organization_user table reference - */ - public JOrganizationUser() { - this(DSL.name("organization_user"), null); - } - - /** - * Create an aliased public.organization_user table reference - */ - public JOrganizationUser(String alias) { - this(DSL.name(alias), ORGANIZATION_USER); - } - - /** - * Create an aliased public.organization_user table reference - */ - public JOrganizationUser(Name alias) { - this(alias, ORGANIZATION_USER); - } - - private JOrganizationUser(Name alias, Table aliased) { - this(alias, aliased, null); - } - - private JOrganizationUser(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment("")); - } - - public JOrganizationUser(Table child, ForeignKey key) { - super(child, key, ORGANIZATION_USER); - } - - @Override - public Schema getSchema() { - return JPublic.PUBLIC; - } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.ORGANIZATION_USER_PK); - } - - @Override - public Identity getIdentity() { - return Keys.IDENTITY_ORGANIZATION_USER; - } - - @Override - public UniqueKey getPrimaryKey() { - return Keys.ORGANIZATION_USER_PK; - } - - @Override - public List> getKeys() { - return Arrays.>asList(Keys.ORGANIZATION_USER_PK); - } - - @Override - public List> getReferences() { - return Arrays.>asList(Keys.ORGANIZATION_USER__ORGANIZATION_USER_USER_ID_FKEY, Keys.ORGANIZATION_USER__ORGANIZATION_USER_ORGANIZATION_ID_FKEY); - } - - public JUsers users() { - return new JUsers(this, Keys.ORGANIZATION_USER__ORGANIZATION_USER_USER_ID_FKEY); - } - - public JOrganization organization() { - return new JOrganization(this, Keys.ORGANIZATION_USER__ORGANIZATION_USER_ORGANIZATION_ID_FKEY); - } - - @Override - public JOrganizationUser as(String alias) { - return new JOrganizationUser(DSL.name(alias), this); - } - - @Override - public JOrganizationUser as(Name alias) { - return new JOrganizationUser(alias, this); - } - - /** - * Rename this table - */ - @Override - public JOrganizationUser rename(String name) { - return new JOrganizationUser(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public JOrganizationUser rename(Name name) { - return new JOrganizationUser(name, null); - } - - // ------------------------------------------------------------------------- - // Row3 type methods - // ------------------------------------------------------------------------- - - @Override - public Row3 fieldsRow() { - return (Row3) super.fieldsRow(); - } -} diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java index 6543c5db6..4f07f222f 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/JProject.java @@ -22,7 +22,7 @@ import org.jooq.JSONB; import org.jooq.Name; import org.jooq.Record; -import org.jooq.Row10; +import org.jooq.Row7; import org.jooq.Schema; import org.jooq.Table; import org.jooq.TableField; @@ -44,7 +44,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class JProject extends TableImpl { - private static final long serialVersionUID = 1291621622; + private static final long serialVersionUID = 1584335243; /** * The reference instance of public.project @@ -94,21 +94,6 @@ public Class getRecordType() { */ public final TableField ALLOCATED_STORAGE = createField(DSL.name("allocated_storage"), org.jooq.impl.SQLDataType.BIGINT.nullable(false).defaultValue(org.jooq.impl.DSL.field("0", org.jooq.impl.SQLDataType.BIGINT)), this, ""); - /** - * The column public.project.organization_id. - */ - public final TableField ORGANIZATION_ID = createField(DSL.name("organization_id"), org.jooq.impl.SQLDataType.BIGINT, this, ""); - - /** - * The column public.project.slug. - */ - public final TableField SLUG = createField(DSL.name("slug"), org.jooq.impl.SQLDataType.CLOB, this, ""); - - /** - * The column public.project.key. - */ - public final TableField KEY = createField(DSL.name("key"), org.jooq.impl.SQLDataType.CLOB, this, ""); - /** * Create a public.project table reference */ @@ -149,7 +134,7 @@ public Schema getSchema() { @Override public List getIndexes() { - return Arrays.asList(Indexes.PROJECT_KEY_IDX, Indexes.PROJECT_KEY_KEY, Indexes.PROJECT_NAME_KEY, Indexes.PROJECT_PK); + return Arrays.asList(Indexes.PROJECT_NAME_KEY, Indexes.PROJECT_PK); } @Override @@ -164,7 +149,7 @@ public UniqueKey getPrimaryKey() { @Override public List> getKeys() { - return Arrays.>asList(Keys.PROJECT_PK, Keys.PROJECT_NAME_KEY, Keys.PROJECT_KEY_KEY); + return Arrays.>asList(Keys.PROJECT_PK, Keys.PROJECT_NAME_KEY); } @Override @@ -194,11 +179,11 @@ public JProject rename(Name name) { } // ------------------------------------------------------------------------- - // Row10 type methods + // Row7 type methods // ------------------------------------------------------------------------- @Override - public Row10 fieldsRow() { - return (Row10) super.fieldsRow(); + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); } } diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationRecord.java deleted file mode 100644 index a18e96190..000000000 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationRecord.java +++ /dev/null @@ -1,340 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package com.epam.ta.reportportal.jooq.tables.records; - - -import com.epam.ta.reportportal.jooq.tables.JOrganization; - -import java.sql.Timestamp; - -import javax.annotation.processing.Generated; - -import org.jooq.Field; -import org.jooq.Record1; -import org.jooq.Record7; -import org.jooq.Row7; -import org.jooq.impl.UpdatableRecordImpl; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.12.4" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JOrganizationRecord extends UpdatableRecordImpl implements Record7 { - - private static final long serialVersionUID = -1096156236; - - /** - * Setter for public.organization.id. - */ - public void setId(Long value) { - set(0, value); - } - - /** - * Getter for public.organization.id. - */ - public Long getId() { - return (Long) get(0); - } - - /** - * Setter for public.organization.created_at. - */ - public void setCreatedAt(Timestamp value) { - set(1, value); - } - - /** - * Getter for public.organization.created_at. - */ - public Timestamp getCreatedAt() { - return (Timestamp) get(1); - } - - /** - * Setter for public.organization.updated_at. - */ - public void setUpdatedAt(Timestamp value) { - set(2, value); - } - - /** - * Getter for public.organization.updated_at. - */ - public Timestamp getUpdatedAt() { - return (Timestamp) get(2); - } - - /** - * Setter for public.organization.name. - */ - public void setName(String value) { - set(3, value); - } - - /** - * Getter for public.organization.name. - */ - public String getName() { - return (String) get(3); - } - - /** - * Setter for public.organization.organization_type. - */ - public void setOrganizationType(String value) { - set(4, value); - } - - /** - * Getter for public.organization.organization_type. - */ - public String getOrganizationType() { - return (String) get(4); - } - - /** - * Setter for public.organization.external_id. - */ - public void setExternalId(String value) { - set(5, value); - } - - /** - * Getter for public.organization.external_id. - */ - public String getExternalId() { - return (String) get(5); - } - - /** - * Setter for public.organization.slug. - */ - public void setSlug(String value) { - set(6, value); - } - - /** - * Getter for public.organization.slug. - */ - public String getSlug() { - return (String) get(6); - } - - // ------------------------------------------------------------------------- - // Primary key information - // ------------------------------------------------------------------------- - - @Override - public Record1 key() { - return (Record1) super.key(); - } - - // ------------------------------------------------------------------------- - // Record7 type implementation - // ------------------------------------------------------------------------- - - @Override - public Row7 fieldsRow() { - return (Row7) super.fieldsRow(); - } - - @Override - public Row7 valuesRow() { - return (Row7) super.valuesRow(); - } - - @Override - public Field field1() { - return JOrganization.ORGANIZATION.ID; - } - - @Override - public Field field2() { - return JOrganization.ORGANIZATION.CREATED_AT; - } - - @Override - public Field field3() { - return JOrganization.ORGANIZATION.UPDATED_AT; - } - - @Override - public Field field4() { - return JOrganization.ORGANIZATION.NAME; - } - - @Override - public Field field5() { - return JOrganization.ORGANIZATION.ORGANIZATION_TYPE; - } - - @Override - public Field field6() { - return JOrganization.ORGANIZATION.EXTERNAL_ID; - } - - @Override - public Field field7() { - return JOrganization.ORGANIZATION.SLUG; - } - - @Override - public Long component1() { - return getId(); - } - - @Override - public Timestamp component2() { - return getCreatedAt(); - } - - @Override - public Timestamp component3() { - return getUpdatedAt(); - } - - @Override - public String component4() { - return getName(); - } - - @Override - public String component5() { - return getOrganizationType(); - } - - @Override - public String component6() { - return getExternalId(); - } - - @Override - public String component7() { - return getSlug(); - } - - @Override - public Long value1() { - return getId(); - } - - @Override - public Timestamp value2() { - return getCreatedAt(); - } - - @Override - public Timestamp value3() { - return getUpdatedAt(); - } - - @Override - public String value4() { - return getName(); - } - - @Override - public String value5() { - return getOrganizationType(); - } - - @Override - public String value6() { - return getExternalId(); - } - - @Override - public String value7() { - return getSlug(); - } - - @Override - public JOrganizationRecord value1(Long value) { - setId(value); - return this; - } - - @Override - public JOrganizationRecord value2(Timestamp value) { - setCreatedAt(value); - return this; - } - - @Override - public JOrganizationRecord value3(Timestamp value) { - setUpdatedAt(value); - return this; - } - - @Override - public JOrganizationRecord value4(String value) { - setName(value); - return this; - } - - @Override - public JOrganizationRecord value5(String value) { - setOrganizationType(value); - return this; - } - - @Override - public JOrganizationRecord value6(String value) { - setExternalId(value); - return this; - } - - @Override - public JOrganizationRecord value7(String value) { - setSlug(value); - return this; - } - - @Override - public JOrganizationRecord values(Long value1, Timestamp value2, Timestamp value3, String value4, String value5, String value6, String value7) { - value1(value1); - value2(value2); - value3(value3); - value4(value4); - value5(value5); - value6(value6); - value7(value7); - return this; - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached JOrganizationRecord - */ - public JOrganizationRecord() { - super(JOrganization.ORGANIZATION); - } - - /** - * Create a detached, initialised JOrganizationRecord - */ - public JOrganizationRecord(Long id, Timestamp createdAt, Timestamp updatedAt, String name, String organizationType, String externalId, String slug) { - super(JOrganization.ORGANIZATION); - - set(0, id); - set(1, createdAt); - set(2, updatedAt); - set(3, name); - set(4, organizationType); - set(5, externalId); - set(6, slug); - } -} diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationUserRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationUserRecord.java deleted file mode 100644 index 73d5f60df..000000000 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JOrganizationUserRecord.java +++ /dev/null @@ -1,191 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package com.epam.ta.reportportal.jooq.tables.records; - - -import com.epam.ta.reportportal.jooq.enums.JOrganizationRoleEnum; -import com.epam.ta.reportportal.jooq.tables.JOrganizationUser; - -import javax.annotation.processing.Generated; - -import org.jooq.Field; -import org.jooq.Record2; -import org.jooq.Record3; -import org.jooq.Row3; -import org.jooq.impl.UpdatableRecordImpl; - - -/** - * This class is generated by jOOQ. - */ -@Generated( - value = { - "http://www.jooq.org", - "jOOQ version:3.12.4" - }, - comments = "This class is generated by jOOQ" -) -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JOrganizationUserRecord extends UpdatableRecordImpl implements Record3 { - - private static final long serialVersionUID = -1276662636; - - /** - * Setter for public.organization_user.user_id. - */ - public void setUserId(Long value) { - set(0, value); - } - - /** - * Getter for public.organization_user.user_id. - */ - public Long getUserId() { - return (Long) get(0); - } - - /** - * Setter for public.organization_user.organization_id. - */ - public void setOrganizationId(Long value) { - set(1, value); - } - - /** - * Getter for public.organization_user.organization_id. - */ - public Long getOrganizationId() { - return (Long) get(1); - } - - /** - * Setter for public.organization_user.organization_role. - */ - public void setOrganizationRole(JOrganizationRoleEnum value) { - set(2, value); - } - - /** - * Getter for public.organization_user.organization_role. - */ - public JOrganizationRoleEnum getOrganizationRole() { - return (JOrganizationRoleEnum) get(2); - } - - // ------------------------------------------------------------------------- - // Primary key information - // ------------------------------------------------------------------------- - - @Override - public Record2 key() { - return (Record2) super.key(); - } - - // ------------------------------------------------------------------------- - // Record3 type implementation - // ------------------------------------------------------------------------- - - @Override - public Row3 fieldsRow() { - return (Row3) super.fieldsRow(); - } - - @Override - public Row3 valuesRow() { - return (Row3) super.valuesRow(); - } - - @Override - public Field field1() { - return JOrganizationUser.ORGANIZATION_USER.USER_ID; - } - - @Override - public Field field2() { - return JOrganizationUser.ORGANIZATION_USER.ORGANIZATION_ID; - } - - @Override - public Field field3() { - return JOrganizationUser.ORGANIZATION_USER.ORGANIZATION_ROLE; - } - - @Override - public Long component1() { - return getUserId(); - } - - @Override - public Long component2() { - return getOrganizationId(); - } - - @Override - public JOrganizationRoleEnum component3() { - return getOrganizationRole(); - } - - @Override - public Long value1() { - return getUserId(); - } - - @Override - public Long value2() { - return getOrganizationId(); - } - - @Override - public JOrganizationRoleEnum value3() { - return getOrganizationRole(); - } - - @Override - public JOrganizationUserRecord value1(Long value) { - setUserId(value); - return this; - } - - @Override - public JOrganizationUserRecord value2(Long value) { - setOrganizationId(value); - return this; - } - - @Override - public JOrganizationUserRecord value3(JOrganizationRoleEnum value) { - setOrganizationRole(value); - return this; - } - - @Override - public JOrganizationUserRecord values(Long value1, Long value2, JOrganizationRoleEnum value3) { - value1(value1); - value2(value2); - value3(value3); - return this; - } - - // ------------------------------------------------------------------------- - // Constructors - // ------------------------------------------------------------------------- - - /** - * Create a detached JOrganizationUserRecord - */ - public JOrganizationUserRecord() { - super(JOrganizationUser.ORGANIZATION_USER); - } - - /** - * Create a detached, initialised JOrganizationUserRecord - */ - public JOrganizationUserRecord(Long userId, Long organizationId, JOrganizationRoleEnum organizationRole) { - super(JOrganizationUser.ORGANIZATION_USER); - - set(0, userId); - set(1, organizationId); - set(2, organizationRole); - } -} diff --git a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java index 6a21631ee..164b64e73 100644 --- a/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java +++ b/src/main/java/com/epam/ta/reportportal/jooq/tables/records/JProjectRecord.java @@ -13,8 +13,8 @@ import org.jooq.Field; import org.jooq.JSONB; import org.jooq.Record1; -import org.jooq.Record10; -import org.jooq.Row10; +import org.jooq.Record7; +import org.jooq.Row7; import org.jooq.impl.UpdatableRecordImpl; @@ -29,9 +29,9 @@ comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class JProjectRecord extends UpdatableRecordImpl implements Record10 { +public class JProjectRecord extends UpdatableRecordImpl implements Record7 { - private static final long serialVersionUID = 2145940380; + private static final long serialVersionUID = 832057346; /** * Setter for public.project.id. @@ -131,48 +131,6 @@ public Long getAllocatedStorage() { return (Long) get(6); } - /** - * Setter for public.project.organization_id. - */ - public void setOrganizationId(Long value) { - set(7, value); - } - - /** - * Getter for public.project.organization_id. - */ - public Long getOrganizationId() { - return (Long) get(7); - } - - /** - * Setter for public.project.slug. - */ - public void setSlug(String value) { - set(8, value); - } - - /** - * Getter for public.project.slug. - */ - public String getSlug() { - return (String) get(8); - } - - /** - * Setter for public.project.key. - */ - public void setKey(String value) { - set(9, value); - } - - /** - * Getter for public.project.key. - */ - public String getKey() { - return (String) get(9); - } - // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -183,17 +141,17 @@ public Record1 key() { } // ------------------------------------------------------------------------- - // Record10 type implementation + // Record7 type implementation // ------------------------------------------------------------------------- @Override - public Row10 fieldsRow() { - return (Row10) super.fieldsRow(); + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); } @Override - public Row10 valuesRow() { - return (Row10) super.valuesRow(); + public Row7 valuesRow() { + return (Row7) super.valuesRow(); } @Override @@ -231,21 +189,6 @@ public Field field7() { return JProject.PROJECT.ALLOCATED_STORAGE; } - @Override - public Field field8() { - return JProject.PROJECT.ORGANIZATION_ID; - } - - @Override - public Field field9() { - return JProject.PROJECT.SLUG; - } - - @Override - public Field field10() { - return JProject.PROJECT.KEY; - } - @Override public Long component1() { return getId(); @@ -281,21 +224,6 @@ public Long component7() { return getAllocatedStorage(); } - @Override - public Long component8() { - return getOrganizationId(); - } - - @Override - public String component9() { - return getSlug(); - } - - @Override - public String component10() { - return getKey(); - } - @Override public Long value1() { return getId(); @@ -331,21 +259,6 @@ public Long value7() { return getAllocatedStorage(); } - @Override - public Long value8() { - return getOrganizationId(); - } - - @Override - public String value9() { - return getSlug(); - } - - @Override - public String value10() { - return getKey(); - } - @Override public JProjectRecord value1(Long value) { setId(value); @@ -389,25 +302,7 @@ public JProjectRecord value7(Long value) { } @Override - public JProjectRecord value8(Long value) { - setOrganizationId(value); - return this; - } - - @Override - public JProjectRecord value9(String value) { - setSlug(value); - return this; - } - - @Override - public JProjectRecord value10(String value) { - setKey(value); - return this; - } - - @Override - public JProjectRecord values(Long value1, String value2, String value3, String value4, Timestamp value5, JSONB value6, Long value7, Long value8, String value9, String value10) { + public JProjectRecord values(Long value1, String value2, String value3, String value4, Timestamp value5, JSONB value6, Long value7) { value1(value1); value2(value2); value3(value3); @@ -415,9 +310,6 @@ public JProjectRecord values(Long value1, String value2, String value3, String v value5(value5); value6(value6); value7(value7); - value8(value8); - value9(value9); - value10(value10); return this; } @@ -435,7 +327,7 @@ public JProjectRecord() { /** * Create a detached, initialised JProjectRecord */ - public JProjectRecord(Long id, String name, String projectType, String organization, Timestamp creationDate, JSONB metadata, Long allocatedStorage, Long organizationId, String slug, String key) { + public JProjectRecord(Long id, String name, String projectType, String organization, Timestamp creationDate, JSONB metadata, Long allocatedStorage) { super(JProject.PROJECT); set(0, id); @@ -445,8 +337,5 @@ public JProjectRecord(Long id, String name, String projectType, String organizat set(4, creationDate); set(5, metadata); set(6, allocatedStorage); - set(7, organizationId); - set(8, slug); - set(9, key); } }