diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerCreateDto.java
index d5b8f827c2e95a531961f6e48a862e8457229795..7080d2b5d96e2763a8ebf750eea27f9b08fa4a50 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerCreateDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerCreateDto.java
@@ -46,6 +46,10 @@ public class ContainerCreateDto {
@JsonProperty("ui_port")
private Integer uiPort;
+ @NotNull
+ @Schema(example = "50")
+ private Long quota;
+
@NotBlank
@JsonProperty("privileged_username")
@Schema(description = "Username of privileged user", example = "root")
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java
index 2031ee15aa6ed44d60682315604a726fe7af03c6..4e9fea5b7cbada74155ad2760ccdc99fb2e23490 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java
@@ -27,6 +27,11 @@ public class ImageCreateDto {
@Schema(example = "mariadb")
private String name;
+ @NotNull
+ @JsonProperty("is_default")
+ @Schema(example = "false")
+ private Boolean isDefault;
+
@NotBlank
@Parameter(example = "10.5")
private String version;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
index 78510d51c268967c846ff81fb772409d610c797e..8250b6ae4350c48eca7c5dc1d0ec0a08935e9196 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
@@ -54,7 +54,7 @@ public class ContainerImage {
@Column(nullable = false)
private Integer defaultPort;
- @Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT FALSE")
+ @Column(nullable = false, unique = true, columnDefinition = "BOOLEAN DEFAULT FALSE")
private Boolean isDefault = false;
@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "image")
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
index eb9b352095bfd1c875cde9fac6db5d45ad8d5e6d..ff18c0137d06964bcc49c02367f95eb49a3b4033 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java
@@ -15,9 +15,7 @@ import jakarta.persistence.*;
@AllArgsConstructor
@NoArgsConstructor
@EntityListeners(AuditingEntityListener.class)
-@jakarta.persistence.Table(name = "mdb_view_columns", uniqueConstraints = {
- @UniqueConstraint(columnNames = {"view_id", "internalName"})
-})
+@jakarta.persistence.Table(name = "mdb_view_columns")
public class ViewColumn implements Comparable<ViewColumn> {
@Id
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
index 68c3a370b41c301132671d52ed79310e920aaf81..a9b04058e2373f6cb98f8f9cbedb11ba980fdcfc 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java
@@ -416,6 +416,9 @@ public interface MetadataMapper {
};
}
+ @Mappings({
+ @Mapping(target = "isDefault", source = "isDefault")
+ })
ContainerImage createImageDtoToContainerImage(ImageCreateDto data);
ImageBriefDto containerImageToImageBriefDto(ContainerImage data);
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ImageRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ImageRepository.java
index 593a4727180d55b4bc0cb1971c0aecf49313f8cb..23fa40c5be1fd3a6e9e430fafcaccc896e37970d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ImageRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ImageRepository.java
@@ -10,8 +10,8 @@ import java.util.Optional;
@Repository
public interface ImageRepository extends JpaRepository<ContainerImage, Long> {
- List<ContainerImage> findAll();
-
Optional<ContainerImage> findByNameAndVersion(String name, String version);
+ Optional<ContainerImage> findByIsDefault(Boolean isDefault);
+
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
index 15cdb1b03b2c8096377af9b0f206e70d66d87bd5..8ffe328aa95342c6b8ce6fe93a910658ad2ab043 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
@@ -13,6 +13,7 @@ import at.tuwien.service.ContainerService;
import at.tuwien.service.BrokerService;
import at.tuwien.service.impl.DatabaseServiceImpl;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +63,11 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
@Autowired
private DatabaseEndpoint databaseEndpoint;
+ @BeforeEach
+ public void beforeEach() {
+ genesis();
+ }
+
@Test
@WithAnonymousUser
public void create_anonymous_fails() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java
index 5b2e607ec1ba9c6fe33055d4533042da4e88b2f9..474db3910bef5233d676bf387edd63afcd4aa5c6 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java
@@ -81,8 +81,8 @@ public class AuthenticationPrivilegedIntegrationMvcTest extends AbstractUnitTest
genesis();
/* metadata database */
licenseRepository.save(LICENSE_1);
- containerRepository.save(CONTAINER_1);
userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4));
+ containerRepository.save(CONTAINER_1);
databaseRepository.save(DATABASE_1);
/* keycloak */
keycloakUtils.deleteUser(USER_1_USERNAME);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java
index 0c0cf075c4d83645a7df6bae035cbae4d458ad1e..648bb6ab290b319a817aba31d49310d43416e4a3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java
@@ -76,8 +76,8 @@ public class DataCiteIdentifierServicePersistenceTest extends AbstractUnitTest {
genesis();
/* metadata database */
licenseRepository.save(LICENSE_1);
- containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5));
+ containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
databaseRepository.saveAll(List.of(DATABASE_1, DATABASE_2, DATABASE_3, DATABASE_4));
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
index 283450cc256197b1add589295304bd69fbe89dab..b4bd67f88d225a5cfc5398fac6c485b48c674ac2 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java
@@ -47,8 +47,8 @@ public class DatabaseServicePersistenceTest extends AbstractUnitTest {
genesis();
/* metadata database */
licenseRepository.save(LICENSE_1);
- containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5));
+ containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
databaseRepository.saveAll(List.of(DATABASE_1, DATABASE_2, DATABASE_3, DATABASE_4));
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
index f8d2b7dfb96e4d7d3b1bc14ab2fd2699d2be05a2..68d6e1a93d5fe594d207df5ae0edc9da1b5c80b3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
@@ -1,7 +1,6 @@
package at.tuwien.service;
import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.database.DatabaseCreateDto;
import at.tuwien.api.database.DatabaseModifyVisibilityDto;
import at.tuwien.api.database.internal.CreateDatabaseDto;
import at.tuwien.entities.database.Database;
@@ -43,9 +42,6 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
@MockBean
private DatabaseRepository databaseRepository;
- @MockBean
- private ContainerRepository containerRepository;
-
@Autowired
private DatabaseService databaseService;
@@ -92,23 +88,6 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
});
}
- @Test
- public void create_notFound_fails() {
- final DatabaseCreateDto request = DatabaseCreateDto.builder()
- .cid(CONTAINER_1_ID)
- .name(DATABASE_1_NAME)
- .build();
-
- /* mock */
- when(containerRepository.findById(CONTAINER_1_ID))
- .thenReturn(Optional.empty());
-
- /* test */
- assertThrows(ContainerNotFoundException.class, () -> {
- databaseService.create(CONTAINER_1, request, USER_1);
- });
- }
-
@Test
public void find_succeeds() throws DatabaseNotFoundException {
@@ -138,26 +117,11 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
public void create_succeeds() throws Exception {
/* mock */
- when(containerRepository.findById(DATABASE_1.getCid()))
- .thenReturn(Optional.of(CONTAINER_1));
when(dataServiceGateway.createDatabase(any(CreateDatabaseDto.class)))
.thenReturn(DATABASE_1_DTO);
/* test */
- generic_create(DATABASE_1_CREATE, DATABASE_1);
- }
-
- @Test
- public void create_containerNotFound_fails() {
-
- /* mock */
- when(containerRepository.findById(anyLong()))
- .thenReturn(Optional.empty());
-
- /* test */
- assertThrows(ContainerNotFoundException.class, () -> {
- generic_create(DATABASE_1_CREATE, DATABASE_1);
- });
+ generic_create();
}
@Test
@@ -165,15 +129,13 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
DatabaseNotFoundException {
/* mock */
- when(containerRepository.findById(DATABASE_1.getCid()))
- .thenReturn(Optional.of(CONTAINER_1));
doThrow(DataServiceException.class)
.when(dataServiceGateway)
.createDatabase(any(CreateDatabaseDto.class));
/* test */
assertThrows(DataServiceException.class, () -> {
- generic_create(DATABASE_1_CREATE, DATABASE_1);
+ generic_create();
});
}
@@ -182,15 +144,13 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
DatabaseNotFoundException {
/* mock */
- when(containerRepository.findById(DATABASE_1.getCid()))
- .thenReturn(Optional.of(CONTAINER_1));
doThrow(DataServiceConnectionException.class)
.when(dataServiceGateway)
.createDatabase(any(CreateDatabaseDto.class));
/* test */
assertThrows(DataServiceConnectionException.class, () -> {
- generic_create(DATABASE_1_CREATE, DATABASE_1);
+ generic_create();
});
}
@@ -304,7 +264,7 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
/* ## GENERIC TEST CASES ## */
/* ################################################################################################### */
- protected Database generic_create(DatabaseCreateDto createDto, Database database) throws DataServiceException,
+ protected Database generic_create() throws DataServiceException,
DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
ContainerNotFoundException, SearchServiceException, SearchServiceConnectionException {
@@ -312,13 +272,11 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
when(searchServiceGateway.update(any(Database.class)))
.thenReturn(DATABASE_1_DTO);
when(databaseRepository.save(any(Database.class)))
- .thenReturn(database);
+ .thenReturn(DATABASE_1);
/* test */
- final Database response = databaseService.create(CONTAINER_1, createDto, USER_1);
- assertEquals(database.getName(), response.getName());
- assertEquals(database.getIsPublic(), response.getIsPublic());
- assertTrue(response.getInternalName().startsWith(database.getInternalName()));
+ final Database response = databaseService.create(CONTAINER_1, DATABASE_1_CREATE, USER_1);
+ assertTrue(response.getInternalName().startsWith(DATABASE_1_INTERNALNAME));
assertNotNull(response.getContainer());
assertNotNull(response.getTables());
assertNotNull(response.getViews());
@@ -332,7 +290,6 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
assertNotNull(response.getOwner());
assertNull(response.getImage());
assertNotNull(response.getExchangeName());
- assertEquals(database.getIsPublic(), response.getIsPublic());
return response;
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java
index 6b3ff624b0e5ebf47757824f645e4a120e43b243..246ae7de1a4beb7a55f4cadf13f142b48ef995fd 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java
@@ -73,8 +73,8 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
genesis();
/* metadata database */
licenseRepository.save(LICENSE_1);
- containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5));
+ containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
databaseRepository.saveAll(List.of(DATABASE_1, DATABASE_2, DATABASE_3, DATABASE_4));
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServicePersistenceTest.java
index 50e0dc08f657fb5230838397c90a21a619d8bd8b..fb501cb28179e895dfcf4340afb7dc0cfee547fb 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServicePersistenceTest.java
@@ -1,12 +1,12 @@
package at.tuwien.service;
+import at.tuwien.exception.ImageInvalidException;
import at.tuwien.test.AbstractUnitTest;
import at.tuwien.api.container.image.ImageCreateDto;
import at.tuwien.exception.ImageAlreadyExistsException;
import at.tuwien.repository.ContainerRepository;
import at.tuwien.repository.ImageRepository;
import lombok.extern.log4j.Log4j2;
-import org.apache.http.auth.BasicUserPrincipal;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,8 +15,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension;
-import java.security.Principal;
-
import static org.junit.jupiter.api.Assertions.*;
@Log4j2
@@ -42,7 +40,7 @@ public class ImageServicePersistenceTest extends AbstractUnitTest {
}
@Test
- public void create_succeeds() throws ImageAlreadyExistsException {
+ public void create_succeeds() throws ImageAlreadyExistsException, ImageInvalidException {
final ImageCreateDto request = ImageCreateDto.builder()
.name(IMAGE_1_NAME)
.version("11.1.4") // new tag
@@ -51,11 +49,11 @@ public class ImageServicePersistenceTest extends AbstractUnitTest {
.dialect(IMAGE_1_DIALECT)
.driverClass(IMAGE_1_DRIVER)
.defaultPort(IMAGE_1_PORT)
+ .isDefault(false)
.build();
- final Principal principal = new BasicUserPrincipal(USER_1_USERNAME);
/* test */
- imageService.create(request, principal);
+ imageService.create(request, USER_1_PRINCIPAL);
}
@Test
@@ -67,12 +65,31 @@ public class ImageServicePersistenceTest extends AbstractUnitTest {
.driverClass(IMAGE_1_DRIVER)
.jdbcMethod(IMAGE_1_JDBC)
.dialect(IMAGE_1_DIALECT)
+ .isDefault(IMAGE_1_IS_DEFAULT)
.build();
- final Principal principal = new BasicUserPrincipal(USER_1_USERNAME);
/* test */
assertThrows(ImageAlreadyExistsException.class, () -> {
- imageService.create(request, principal);
+ imageService.create(request, USER_1_PRINCIPAL);
+ });
+ }
+
+ @Test
+ public void create_multipleDefaultImages_fails() {
+ final ImageCreateDto request = ImageCreateDto.builder()
+ .name("mariadb")
+ .version("10.5")
+ .registry(IMAGE_1_REGISTRY)
+ .defaultPort(IMAGE_1_PORT)
+ .driverClass(IMAGE_1_DRIVER)
+ .jdbcMethod(IMAGE_1_JDBC)
+ .dialect(IMAGE_1_DIALECT)
+ .isDefault(true) // <<<<
+ .build();
+
+ /* test */
+ assertThrows(ImageInvalidException.class, () -> {
+ imageService.create(request, USER_1_PRINCIPAL);
});
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
index e66d35d8ea0d8b0f9aff850cf4baf880e4240c12..e2d7d33896f6c1b13d0ce9ab5af3262c8668f0bc 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java
@@ -71,8 +71,8 @@ public class TableServicePersistenceTest extends AbstractUnitTest {
genesis();
/* metadata database */
licenseRepository.save(LICENSE_1);
- containerRepository.save(CONTAINER_1);
userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
+ containerRepository.save(CONTAINER_1);
databaseRepository.saveAll(List.of(DATABASE_1));
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
index e23320017c54592662f42b24c3eb7039a3f1a540..3ed06bfd7c8ba6222bcbfbf45cfeb9a602e8fa91 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
@@ -61,8 +61,8 @@ public class ViewServicePersistenceTest extends AbstractUnitTest {
genesis();
/* metadata database */
licenseRepository.save(LICENSE_1);
- containerRepository.save(CONTAINER_1);
userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
+ containerRepository.save(CONTAINER_1);
databaseRepository.save(DATABASE_1);
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ImageService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ImageService.java
index bb5134ebc4f1435f9db797f54b0128ab2cff9bbb..cc51082d65f1b72a066208b83276169fd36d8f5d 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ImageService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ImageService.java
@@ -4,6 +4,7 @@ import at.tuwien.api.container.image.ImageChangeDto;
import at.tuwien.api.container.image.ImageCreateDto;
import at.tuwien.entities.container.image.ContainerImage;
import at.tuwien.exception.ImageAlreadyExistsException;
+import at.tuwien.exception.ImageInvalidException;
import at.tuwien.exception.ImageNotFoundException;
import java.security.Principal;
@@ -32,8 +33,11 @@ public interface ImageService {
* @param createDto The new image.
* @param principal The user principal.
* @return The container image, if successful.
+ * @throws ImageAlreadyExistsException The image already exists.
+ * @throws ImageInvalidException The default image cannot be created as a default image already exists.
*/
- ContainerImage create(ImageCreateDto createDto, Principal principal) throws ImageAlreadyExistsException;
+ ContainerImage create(ImageCreateDto createDto, Principal principal) throws ImageAlreadyExistsException,
+ ImageInvalidException;
/**
* Updates a container image with given id in the metadata database.
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
index 7342f5bd2dcbe50ef8b0dcfafde46abd3ff8fdc6..1c91de7be10e544cfe9b9e5ce71c3af5c3f89e88 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java
@@ -34,17 +34,14 @@ import java.util.*;
public class DatabaseServiceImpl implements DatabaseService {
private final MetadataMapper metadataMapper;
- private final ContainerService containerService;
private final DatabaseRepository databaseRepository;
private final DataServiceGateway dataServiceGateway;
private final SearchServiceGateway searchServiceGateway;
@Autowired
- public DatabaseServiceImpl(MetadataMapper metadataMapper, ContainerService containerService,
- DatabaseRepository databaseRepository, DataServiceGateway dataServiceGateway,
- SearchServiceGateway searchServiceGateway) {
+ public DatabaseServiceImpl(MetadataMapper metadataMapper, DatabaseRepository databaseRepository,
+ DataServiceGateway dataServiceGateway, SearchServiceGateway searchServiceGateway) {
this.metadataMapper = metadataMapper;
- this.containerService = containerService;
this.databaseRepository = databaseRepository;
this.dataServiceGateway = dataServiceGateway;
this.searchServiceGateway = searchServiceGateway;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java
index 8e4decfc1724a010e4d62f38491ad3404d259b1d..84fdffcf43b1e6e6f110bf0acf72d4ca75a3a3cf 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java
@@ -4,6 +4,7 @@ import at.tuwien.api.container.image.ImageChangeDto;
import at.tuwien.api.container.image.ImageCreateDto;
import at.tuwien.entities.container.image.ContainerImage;
import at.tuwien.exception.ImageAlreadyExistsException;
+import at.tuwien.exception.ImageInvalidException;
import at.tuwien.exception.ImageNotFoundException;
import at.tuwien.mapper.MetadataMapper;
import at.tuwien.repository.ImageRepository;
@@ -51,13 +52,17 @@ public class ImageServiceImpl implements ImageService {
@Override
@Transactional
- public ContainerImage create(ImageCreateDto createDto, Principal principal) throws ImageAlreadyExistsException {
+ public ContainerImage create(ImageCreateDto createDto, Principal principal) throws ImageAlreadyExistsException,
+ ImageInvalidException {
final ContainerImage image = metadataMapper.createImageDtoToContainerImage(createDto);
if (imageRepository.findByNameAndVersion(createDto.getName(), createDto.getVersion()).isPresent()) {
- log.error("Failed to create image {}:{}: exists in the metadata database",
- createDto.getName(), createDto.getVersion());
+ log.error("Failed to create image {}:{}: exists in the metadata database", createDto.getName(), createDto.getVersion());
throw new ImageAlreadyExistsException("Failed to create image " + createDto.getName() + ":" + createDto.getVersion() + ": exists in the metadata database");
}
+ if (createDto.getIsDefault() && imageRepository.findByIsDefault(true).isPresent()) {
+ log.error("Failed to create image {}:{}: default image exists", createDto.getName(), createDto.getVersion());
+ throw new ImageInvalidException("Failed to create image: default image exists");
+ }
final ContainerImage dto;
try {
dto = imageRepository.save(image);
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java
index 23ba450312b224d76e729613c005489fb7cc8826..996dbb9a7d71b00c7988d9da4dc1ddeb3876245e 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java
@@ -9,6 +9,8 @@ import java.util.List;
public abstract class AbstractUnitTest extends BaseTest {
public void genesis() {
+ CONTAINER_1.setDatabases(new LinkedList<>(List.of(DATABASE_1, DATABASE_2, DATABASE_3)));
+ CONTAINER_4.setDatabases(new LinkedList<>(List.of(DATABASE_4)));
/* USER_1 */
USER_1.setAccesses(new LinkedList<>());
/* USER_2 */
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index a6b227cf99cf8e516e7d337700a80fff6f8d6bc4..40556f3f5bc59838bb16953453d8c0fb7539f916 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -136,7 +136,7 @@ import static java.time.temporal.ChronoUnit.MINUTES;
* <li>Identifier 6 (Title=en, Description=en, Query=3)</li>
* </ul>
* <p>
- * Database 4 (Public, User 4)
+ * Database 4 (Public, User 4) -> Container 4
* <li>Identifier 7 (Database=4)</li>
* <ul>
* </ul>
@@ -899,13 +899,14 @@ public abstract class BaseTest {
USER_6_PASSWORD, USER_6_DETAILS.getAuthorities());
public final static Long IMAGE_1_ID = 1L;
- public final static String IMAGE_1_REGISTRY = "docker.io/library";
+ public final static String IMAGE_1_REGISTRY = "docker.io";
public final static String IMAGE_1_NAME = "mariadb";
public final static String IMAGE_1_VERSION = "11.1.3";
public final static String IMAGE_1_DIALECT = "org.hibernate.dialect.MariaDBDialect";
public final static String IMAGE_1_DRIVER = "org.mariadb.jdbc.Driver";
public final static String IMAGE_1_JDBC = "mariadb";
public final static Integer IMAGE_1_PORT = 3306;
+ public final static Boolean IMAGE_1_IS_DEFAULT = true;
public final static Long IMAGE_DATE_1_ID = 1L;
public final static Long IMAGE_DATE_1_IMAGE_ID = IMAGE_1_ID;
@@ -1026,6 +1027,7 @@ public abstract class BaseTest {
.jdbcMethod(IMAGE_1_JDBC)
.driverClass(IMAGE_1_DRIVER)
.defaultPort(IMAGE_1_PORT)
+ .isDefault(IMAGE_1_IS_DEFAULT)
.dateFormats(new LinkedList<>(List.of(IMAGE_DATE_1, IMAGE_DATE_2, IMAGE_DATE_3, IMAGE_DATE_4)))
.build();
@@ -1038,6 +1040,7 @@ public abstract class BaseTest {
.jdbcMethod(IMAGE_1_JDBC)
.driverClass(IMAGE_1_DRIVER)
.defaultPort(IMAGE_1_PORT)
+ .isDefault(IMAGE_1_IS_DEFAULT)
.dateFormats(List.of(IMAGE_DATE_1_DTO, IMAGE_DATE_2_DTO, IMAGE_DATE_3_DTO))
.build();
@@ -1045,6 +1048,7 @@ public abstract class BaseTest {
.id(IMAGE_1_ID)
.name(IMAGE_1_NAME)
.version(IMAGE_1_VERSION)
+ .isDefault(IMAGE_1_IS_DEFAULT)
.build();
public final static Long CONTAINER_1_ID = 1L;
@@ -1076,6 +1080,7 @@ public abstract class BaseTest {
.port(CONTAINER_1_PORT)
.uiHost(CONTAINER_1_UI_HOST)
.uiPort(CONTAINER_1_UI_PORT)
+ .quota(CONTAINER_1_QUOTA)
.uiAdditionalFlags(CONTAINER_1_UI_ADDITIONAL_FLAGS)
.privilegedUsername(CONTAINER_1_PRIVILEGED_USERNAME)
.privilegedPassword(CONTAINER_1_PRIVILEGED_PASSWORD)
@@ -1140,6 +1145,7 @@ public abstract class BaseTest {
.created(CONTAINER_2_CREATED)
.host(CONTAINER_2_HOST)
.port(CONTAINER_2_PORT)
+ .quota(CONTAINER_2_QUOTA)
.privilegedUsername(CONTAINER_2_PRIVILEGED_USERNAME)
.privilegedPassword(CONTAINER_2_PRIVILEGED_PASSWORD)
.build();
@@ -1169,6 +1175,7 @@ public abstract class BaseTest {
public final static String CONTAINER_3_IP = "172.30.0.7";
public final static String CONTAINER_3_HOST = "localhost";
public final static Integer CONTAINER_3_PORT = 3310;
+ public final static Integer CONTAINER_3_QUOTA = 20;
public final static String CONTAINER_3_SIDECAR_HOST = "localhost";
public final static Integer CONTAINER_3_SIDECAR_PORT = 33101;
public final static String CONTAINER_3_PRIVILEGED_USERNAME = "root";
@@ -1183,6 +1190,7 @@ public abstract class BaseTest {
.created(CONTAINER_3_CREATED)
.host(CONTAINER_3_HOST)
.port(CONTAINER_3_PORT)
+ .quota(CONTAINER_3_QUOTA)
.privilegedUsername(CONTAINER_3_PRIVILEGED_USERNAME)
.privilegedPassword(CONTAINER_3_PRIVILEGED_PASSWORD)
.build();
@@ -1194,6 +1202,7 @@ public abstract class BaseTest {
public final static String CONTAINER_4_IP = "172.30.0.8";
public final static String CONTAINER_4_HOST = "localhost";
public final static Integer CONTAINER_4_PORT = 3311;
+ public final static Integer CONTAINER_4_QUOTA = 0;
public final static String CONTAINER_4_SIDECAR_HOST = "localhost";
public final static Integer CONTAINER_4_SIDECAR_PORT = 33111;
public final static String CONTAINER_4_PRIVILEGED_USERNAME = "root";
@@ -1208,6 +1217,7 @@ public abstract class BaseTest {
.created(CONTAINER_4_CREATED)
.host(CONTAINER_4_HOST)
.port(CONTAINER_4_PORT)
+ .quota(CONTAINER_4_QUOTA)
.privilegedUsername(CONTAINER_4_PRIVILEGED_USERNAME)
.privilegedPassword(CONTAINER_4_PRIVILEGED_PASSWORD)
.build();
@@ -2174,8 +2184,12 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.TIMESTAMP)
.build();
+ public final static Long COLUMN_4_1_ID = 44L;
+
+ public final static Long COLUMN_4_2_ID = 45L;
+
public final static List<TableColumn> TABLE_4_COLUMNS = List.of(TableColumn.builder()
- .id(44L)
+ .id(COLUMN_4_1_ID)
.ordinalPosition(0)
.table(TABLE_4)
.name("Timestamp")
@@ -2185,7 +2199,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(45L)
+ .id(COLUMN_4_2_ID)
.ordinalPosition(1)
.table(TABLE_4)
.name("Value")
@@ -2231,7 +2245,7 @@ public abstract class BaseTest {
.build();
public final static List<ColumnDto> TABLE_4_COLUMNS_DTO = List.of(ColumnDto.builder()
- .id(44L)
+ .id(COLUMN_4_1_ID)
.databaseId(DATABASE_1_ID)
.tableId(TABLE_4_ID)
.name("Timestamp")
@@ -2242,7 +2256,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(45L)
+ .id(COLUMN_4_2_ID)
.databaseId(DATABASE_1_ID)
.tableId(TABLE_4_ID)
.name("Value")
@@ -2444,7 +2458,7 @@ public abstract class BaseTest {
.sparqlEndpoint(ONTOLOGY_5_SPARQL_ENDPOINT)
.build();
- public final static Long COLUMN_8_1_ID = 72L;
+ public final static Long COLUMN_8_1_ID = 75L;
public final static Integer COLUMN_8_1_ORDINALPOS = 0;
public final static String COLUMN_8_1_NAME = "ID";
public final static String COLUMN_8_1_INTERNAL_NAME = "id";
@@ -2453,7 +2467,7 @@ public abstract class BaseTest {
public final static Boolean COLUMN_8_1_NULL = false;
public final static Boolean COLUMN_8_1_AUTO_GENERATED = true;
- public final static Long COLUMN_8_2_ID = 73L;
+ public final static Long COLUMN_8_2_ID = 76L;
public final static Integer COLUMN_8_2_ORDINALPOS = 1;
public final static String COLUMN_8_2_NAME = "Value";
public final static String COLUMN_8_2_INTERNAL_NAME = "value";
@@ -2464,7 +2478,7 @@ public abstract class BaseTest {
public final static Boolean COLUMN_8_2_NULL = false;
public final static Boolean COLUMN_8_2_AUTO_GENERATED = false;
- public final static Long COLUMN_8_3_ID = 74L;
+ public final static Long COLUMN_8_3_ID = 77L;
public final static Integer COLUMN_8_3_ORDINALPOS = 2;
public final static String COLUMN_8_3_NAME = "raw";
public final static String COLUMN_8_3_INTERNAL_NAME = "raw";
@@ -2850,8 +2864,18 @@ public abstract class BaseTest {
.columnType(ColumnTypeDto.BIGINT)
.build();
+ public final static Long COLUMN_1_1_ID = 1L;
+
+ public final static Long COLUMN_1_2_ID = 2L;
+
+ public final static Long COLUMN_1_3_ID = 3L;
+
+ public final static Long COLUMN_1_4_ID = 4L;
+
+ public final static Long COLUMN_1_5_ID = 5L;
+
public final static List<TableColumn> TABLE_1_COLUMNS = List.of(TableColumn.builder()
- .id(1L)
+ .id(COLUMN_1_1_ID)
.ordinalPosition(0)
.table(TABLE_1)
.name("id")
@@ -2861,7 +2885,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(2L)
+ .id(COLUMN_1_2_ID)
.ordinalPosition(1)
.table(TABLE_1)
.name("Date")
@@ -2872,7 +2896,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(3L)
+ .id(COLUMN_1_3_ID)
.ordinalPosition(2)
.table(TABLE_1)
.name("Location")
@@ -2883,7 +2907,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(4L)
+ .id(COLUMN_1_4_ID)
.ordinalPosition(3)
.table(TABLE_1)
.name("MinTemp")
@@ -2895,7 +2919,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(5L)
+ .id(COLUMN_1_5_ID)
.ordinalPosition(4)
.table(TABLE_1)
.name("Rainfall")
@@ -2983,8 +3007,14 @@ public abstract class BaseTest {
.constraints(TABLE_1_CONSTRAINTS_CREATE_INVALID_DTO)
.build();
+ public final static Long COLUMN_2_1_ID = 6L;
+
+ public final static Long COLUMN_2_2_ID = 7L;
+
+ public final static Long COLUMN_2_3_ID = 8L;
+
public final static List<TableColumn> TABLE_2_COLUMNS = List.of(TableColumn.builder()
- .id(6L)
+ .id(COLUMN_2_1_ID)
.ordinalPosition(0)
.table(TABLE_2)
.name("location")
@@ -2998,7 +3028,7 @@ public abstract class BaseTest {
.sets(null)
.build(),
TableColumn.builder()
- .id(7L)
+ .id(COLUMN_2_2_ID)
.ordinalPosition(1)
.table(TABLE_2)
.name("lat")
@@ -3013,7 +3043,7 @@ public abstract class BaseTest {
.sets(null)
.build(),
TableColumn.builder()
- .id(8L)
+ .id(COLUMN_2_3_ID)
.ordinalPosition(2)
.table(TABLE_2)
.name("lng")
@@ -3029,21 +3059,21 @@ public abstract class BaseTest {
.build());
public final static ColumnBriefDto TABLE_2_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
- .id(6L)
+ .id(COLUMN_2_1_ID)
.name("location")
.internalName("location")
.columnType(ColumnTypeDto.VARCHAR)
.build();
public final static ColumnBriefDto TABLE_2_COLUMNS_BRIEF_2_DTO = ColumnBriefDto.builder()
- .id(8L)
+ .id(COLUMN_2_3_ID)
.name("lng")
.internalName("lng")
.columnType(ColumnTypeDto.DECIMAL)
.build();
public final static List<ColumnDto> TABLE_2_COLUMNS_DTO = List.of(ColumnDto.builder()
- .id(6L)
+ .id(COLUMN_2_1_ID)
.table(TABLE_2_DTO)
.tableId(TABLE_2_ID)
.databaseId(DATABASE_1_ID)
@@ -3058,7 +3088,7 @@ public abstract class BaseTest {
.sets(null)
.build(),
ColumnDto.builder()
- .id(7L)
+ .id(COLUMN_2_2_ID)
.table(TABLE_2_DTO)
.tableId(TABLE_2_ID)
.databaseId(DATABASE_1_ID)
@@ -3073,7 +3103,7 @@ public abstract class BaseTest {
.sets(null)
.build(),
ColumnDto.builder()
- .id(8L)
+ .id(COLUMN_2_3_ID)
.table(TABLE_2_DTO)
.tableId(TABLE_2_ID)
.databaseId(DATABASE_1_ID)
@@ -3088,15 +3118,85 @@ public abstract class BaseTest {
.sets(null)
.build());
+ public final static Long COLUMN_3_1_ID = 9L;
+
+ public final static Long COLUMN_3_2_ID = 10L;
+
+ public final static Long COLUMN_3_3_ID = 11L;
+
+ public final static Long COLUMN_3_4_ID = 12L;
+
+ public final static Long COLUMN_3_5_ID = 13L;
+
+ public final static Long COLUMN_3_6_ID = 14L;
+
+ public final static Long COLUMN_3_7_ID = 15L;
+
+ public final static Long COLUMN_3_8_ID = 16L;
+
+ public final static Long COLUMN_3_9_ID = 17L;
+
+ public final static Long COLUMN_3_10_ID = 18L;
+
+ public final static Long COLUMN_3_11_ID = 19L;
+
+ public final static Long COLUMN_3_12_ID = 20L;
+
+ public final static Long COLUMN_3_13_ID = 21L;
+
+ public final static Long COLUMN_3_14_ID = 22L;
+
+ public final static Long COLUMN_3_15_ID = 23L;
+
+ public final static Long COLUMN_3_16_ID = 24L;
+
+ public final static Long COLUMN_3_17_ID = 25L;
+
+ public final static Long COLUMN_3_18_ID = 26L;
+
+ public final static Long COLUMN_3_19_ID = 27L;
+
+ public final static Long COLUMN_3_20_ID = 28L;
+
+ public final static Long COLUMN_3_21_ID = 29L;
+
+ public final static Long COLUMN_3_22_ID = 30L;
+
+ public final static Long COLUMN_3_23_ID = 31L;
+
+ public final static Long COLUMN_3_24_ID = 32L;
+
+ public final static Long COLUMN_3_25_ID = 33L;
+
+ public final static Long COLUMN_3_26_ID = 34L;
+
+ public final static Long COLUMN_3_27_ID = 35L;
+
+ public final static Long COLUMN_3_28_ID = 36L;
+
+ public final static Long COLUMN_3_29_ID = 37L;
+
+ public final static Long COLUMN_3_30_ID = 38L;
+
+ public final static Long COLUMN_3_31_ID = 39L;
+
+ public final static Long COLUMN_3_32_ID = 40L;
+
+ public final static Long COLUMN_3_33_ID = 41L;
+
+ public final static Long COLUMN_3_34_ID = 42L;
+
+ public final static Long COLUMN_3_35_ID = 43L;
+
public final static ColumnBriefDto TABLE_3_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
- .id(9L)
+ .id(COLUMN_3_1_ID)
.columnType(ColumnTypeDto.BIGINT)
.name("id")
.internalName("id")
.build();
public final static List<TableColumn> TABLE_3_COLUMNS = List.of(TableColumn.builder()
- .id(9L)
+ .id(COLUMN_3_1_ID)
.table(TABLE_3)
.ordinalPosition(0)
.autoGenerated(true)
@@ -3109,7 +3209,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(10L)
+ .id(COLUMN_3_2_ID)
.table(TABLE_3)
.ordinalPosition(1)
.autoGenerated(false)
@@ -3122,7 +3222,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(11L)
+ .id(COLUMN_3_3_ID)
.table(TABLE_3)
.ordinalPosition(2)
.autoGenerated(false)
@@ -3135,7 +3235,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(12L)
+ .id(COLUMN_3_4_ID)
.table(TABLE_3)
.ordinalPosition(3)
.autoGenerated(false)
@@ -3147,7 +3247,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(13L)
+ .id(COLUMN_3_5_ID)
.table(TABLE_3)
.ordinalPosition(4)
.autoGenerated(false)
@@ -3160,7 +3260,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(14L)
+ .id(COLUMN_3_6_ID)
.table(TABLE_3)
.ordinalPosition(5)
.autoGenerated(false)
@@ -3173,7 +3273,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(15L)
+ .id(COLUMN_3_7_ID)
.table(TABLE_3)
.ordinalPosition(6)
.autoGenerated(false)
@@ -3186,7 +3286,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(16L)
+ .id(COLUMN_3_8_ID)
.table(TABLE_3)
.ordinalPosition(7)
.autoGenerated(false)
@@ -3199,7 +3299,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(17L)
+ .id(COLUMN_3_9_ID)
.table(TABLE_3)
.ordinalPosition(8)
.autoGenerated(false)
@@ -3212,7 +3312,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(18L)
+ .id(COLUMN_3_10_ID)
.table(TABLE_3)
.ordinalPosition(9)
.autoGenerated(false)
@@ -3225,7 +3325,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(19L)
+ .id(COLUMN_3_11_ID)
.table(TABLE_3)
.ordinalPosition(10)
.autoGenerated(false)
@@ -3237,7 +3337,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(20L)
+ .id(COLUMN_3_12_ID)
.table(TABLE_3)
.ordinalPosition(11)
.autoGenerated(false)
@@ -3250,7 +3350,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(21L)
+ .id(COLUMN_3_13_ID)
.table(TABLE_3)
.ordinalPosition(12)
.autoGenerated(false)
@@ -3263,7 +3363,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(22L)
+ .id(COLUMN_3_14_ID)
.table(TABLE_3)
.ordinalPosition(13)
.autoGenerated(false)
@@ -3276,7 +3376,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(23L)
+ .id(COLUMN_3_15_ID)
.table(TABLE_3)
.ordinalPosition(14)
.autoGenerated(false)
@@ -3289,7 +3389,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(24L)
+ .id(COLUMN_3_16_ID)
.table(TABLE_3)
.ordinalPosition(15)
.autoGenerated(false)
@@ -3302,7 +3402,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(25L)
+ .id(COLUMN_3_17_ID)
.table(TABLE_3)
.ordinalPosition(16)
.autoGenerated(false)
@@ -3315,7 +3415,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(26L)
+ .id(COLUMN_3_18_ID)
.table(TABLE_3)
.ordinalPosition(17)
.autoGenerated(false)
@@ -3328,7 +3428,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(27L)
+ .id(COLUMN_3_19_ID)
.table(TABLE_3)
.ordinalPosition(18)
.autoGenerated(false)
@@ -3341,7 +3441,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(28L)
+ .id(COLUMN_3_20_ID)
.table(TABLE_3)
.ordinalPosition(19)
.autoGenerated(false)
@@ -3353,7 +3453,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(29L)
+ .id(COLUMN_3_21_ID)
.table(TABLE_3)
.ordinalPosition(20)
.autoGenerated(false)
@@ -3366,7 +3466,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(30L)
+ .id(COLUMN_3_22_ID)
.table(TABLE_3)
.ordinalPosition(21)
.autoGenerated(false)
@@ -3379,7 +3479,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(31L)
+ .id(COLUMN_3_23_ID)
.table(TABLE_3)
.ordinalPosition(22)
.autoGenerated(false)
@@ -3392,7 +3492,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(32L)
+ .id(COLUMN_3_24_ID)
.table(TABLE_3)
.ordinalPosition(23)
.autoGenerated(false)
@@ -3405,7 +3505,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(33L)
+ .id(COLUMN_3_25_ID)
.table(TABLE_3)
.ordinalPosition(24)
.autoGenerated(false)
@@ -3418,7 +3518,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(34L)
+ .id(COLUMN_3_26_ID)
.table(TABLE_3)
.ordinalPosition(25)
.autoGenerated(false)
@@ -3431,7 +3531,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(35L)
+ .id(COLUMN_3_27_ID)
.table(TABLE_3)
.ordinalPosition(26)
.autoGenerated(false)
@@ -3444,7 +3544,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(36L)
+ .id(COLUMN_3_28_ID)
.table(TABLE_3)
.ordinalPosition(27)
.autoGenerated(false)
@@ -3457,7 +3557,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(37L)
+ .id(COLUMN_3_29_ID)
.table(TABLE_3)
.ordinalPosition(28)
.autoGenerated(false)
@@ -3470,7 +3570,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(38L)
+ .id(COLUMN_3_30_ID)
.table(TABLE_3)
.ordinalPosition(29)
.autoGenerated(false)
@@ -3483,7 +3583,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(39L)
+ .id(COLUMN_3_31_ID)
.table(TABLE_3)
.ordinalPosition(30)
.autoGenerated(false)
@@ -3496,7 +3596,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(40L)
+ .id(COLUMN_3_32_ID)
.table(TABLE_3)
.ordinalPosition(31)
.autoGenerated(false)
@@ -3509,7 +3609,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(41L)
+ .id(COLUMN_3_33_ID)
.table(TABLE_3)
.ordinalPosition(32)
.autoGenerated(false)
@@ -3522,7 +3622,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(42L)
+ .id(COLUMN_3_34_ID)
.table(TABLE_3)
.ordinalPosition(33)
.autoGenerated(false)
@@ -3535,7 +3635,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
TableColumn.builder()
- .id(43L)
+ .id(COLUMN_3_35_ID)
.table(TABLE_3)
.ordinalPosition(34)
.autoGenerated(false)
@@ -3549,7 +3649,7 @@ public abstract class BaseTest {
.build());
public final static List<ColumnDto> TABLE_3_COLUMNS_DTO = List.of(ColumnDto.builder()
- .id(9L)
+ .id(COLUMN_3_1_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3563,7 +3663,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(10L)
+ .id(COLUMN_3_2_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3577,7 +3677,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(11L)
+ .id(COLUMN_3_3_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3591,7 +3691,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(12L)
+ .id(COLUMN_3_4_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3605,7 +3705,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(13L)
+ .id(COLUMN_3_5_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3619,7 +3719,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(14L)
+ .id(COLUMN_3_6_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3633,7 +3733,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(15L)
+ .id(COLUMN_3_7_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3647,7 +3747,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(16L)
+ .id(COLUMN_3_8_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3661,7 +3761,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(17L)
+ .id(COLUMN_3_9_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3675,7 +3775,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(18L)
+ .id(COLUMN_3_10_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3689,7 +3789,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(19L)
+ .id(COLUMN_3_11_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3703,7 +3803,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(20L)
+ .id(COLUMN_3_12_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3717,7 +3817,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(21L)
+ .id(COLUMN_3_13_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3731,7 +3831,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(22L)
+ .id(COLUMN_3_14_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3745,7 +3845,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(23L)
+ .id(COLUMN_3_15_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3759,7 +3859,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(24L)
+ .id(COLUMN_3_16_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3773,7 +3873,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(25L)
+ .id(COLUMN_3_17_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3787,7 +3887,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(26L)
+ .id(COLUMN_3_18_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3801,7 +3901,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(27L)
+ .id(COLUMN_3_19_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3815,7 +3915,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(28L)
+ .id(COLUMN_3_20_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3829,7 +3929,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(29L)
+ .id(COLUMN_3_21_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3843,7 +3943,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(30L)
+ .id(COLUMN_3_22_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3857,7 +3957,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(31L)
+ .id(COLUMN_3_23_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3871,7 +3971,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(32L)
+ .id(COLUMN_3_24_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3885,7 +3985,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(33L)
+ .id(COLUMN_3_25_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3899,7 +3999,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(34L)
+ .id(COLUMN_3_26_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3913,7 +4013,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(35L)
+ .id(COLUMN_3_27_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3927,7 +4027,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(36L)
+ .id(COLUMN_3_28_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3941,7 +4041,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(37L)
+ .id(COLUMN_3_29_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3955,7 +4055,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(38L)
+ .id(COLUMN_3_30_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3969,7 +4069,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(39L)
+ .id(COLUMN_3_31_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3983,7 +4083,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(40L)
+ .id(COLUMN_3_32_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -3997,7 +4097,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(41L)
+ .id(COLUMN_3_33_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -4011,7 +4111,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(42L)
+ .id(COLUMN_3_34_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -4025,7 +4125,7 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build(),
ColumnDto.builder()
- .id(43L)
+ .id(COLUMN_3_35_ID)
.tableId(TABLE_3_ID)
.table(TABLE_3_DTO)
.databaseId(DATABASE_1_ID)
@@ -4039,15 +4139,57 @@ public abstract class BaseTest {
.sets(new LinkedList<>())
.build());
+ public final static Long COLUMN_5_1_ID = 46L;
+
+ public final static Long COLUMN_5_2_ID = 47L;
+
+ public final static Long COLUMN_5_3_ID = 48L;
+
+ public final static Long COLUMN_5_4_ID = 49L;
+
+ public final static Long COLUMN_5_5_ID = 50L;
+
+ public final static Long COLUMN_5_6_ID = 51L;
+
+ public final static Long COLUMN_5_7_ID = 52L;
+
+ public final static Long COLUMN_5_8_ID = 53L;
+
+ public final static Long COLUMN_5_9_ID = 54L;
+
+ public final static Long COLUMN_5_10_ID = 55L;
+
+ public final static Long COLUMN_5_11_ID = 56L;
+
+ public final static Long COLUMN_5_12_ID = 57L;
+
+ public final static Long COLUMN_5_13_ID = 58L;
+
+ public final static Long COLUMN_5_14_ID = 59L;
+
+ public final static Long COLUMN_5_15_ID = 60L;
+
+ public final static Long COLUMN_5_16_ID = 61L;
+
+ public final static Long COLUMN_5_17_ID = 62L;
+
+ public final static Long COLUMN_5_18_ID = 63L;
+
+ public final static Long COLUMN_5_19_ID = 64L;
+
+ public final static Long COLUMN_5_20_ID = 65L;
+
+ public final static Long COLUMN_5_21_ID = 66L;
+
public final static ColumnBriefDto TABLE_5_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
- .id(45L)
+ .id(COLUMN_5_1_ID)
.name("id")
.internalName("id")
.columnType(ColumnTypeDto.BIGINT)
.build();
public final static List<TableColumn> TABLE_5_COLUMNS = List.of(TableColumn.builder()
- .id(45L)
+ .id(COLUMN_5_1_ID)
.ordinalPosition(0)
.table(TABLE_5)
.name("id")
@@ -4057,7 +4199,7 @@ public abstract class BaseTest {
.autoGenerated(true)
.build(),
TableColumn.builder()
- .id(46L)
+ .id(COLUMN_5_2_ID)
.ordinalPosition(1)
.table(TABLE_5)
.name("Animal Name")
@@ -4067,7 +4209,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(47L)
+ .id(COLUMN_5_3_ID)
.ordinalPosition(2)
.table(TABLE_5)
.name("Hair")
@@ -4077,7 +4219,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(48L)
+ .id(COLUMN_5_4_ID)
.ordinalPosition(3)
.table(TABLE_5)
.name("Feathers")
@@ -4087,7 +4229,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(49L)
+ .id(COLUMN_5_5_ID)
.ordinalPosition(4)
.table(TABLE_5)
.name("Bread")
@@ -4097,7 +4239,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(50L)
+ .id(COLUMN_5_6_ID)
.ordinalPosition(5)
.table(TABLE_5)
.name("Eggs")
@@ -4107,7 +4249,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(51L)
+ .id(COLUMN_5_7_ID)
.ordinalPosition(6)
.table(TABLE_5)
.name("Milk")
@@ -4117,7 +4259,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(52L)
+ .id(COLUMN_5_8_ID)
.ordinalPosition(7)
.table(TABLE_5)
.name("Water")
@@ -4127,7 +4269,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(53L)
+ .id(COLUMN_5_9_ID)
.ordinalPosition(8)
.table(TABLE_5)
.name("Airborne")
@@ -4137,7 +4279,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(54L)
+ .id(COLUMN_5_10_ID)
.ordinalPosition(9)
.table(TABLE_5)
.name("Waterborne")
@@ -4147,7 +4289,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(55L)
+ .id(COLUMN_5_11_ID)
.ordinalPosition(10)
.table(TABLE_5)
.name("Aquantic")
@@ -4157,7 +4299,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(56L)
+ .id(COLUMN_5_12_ID)
.ordinalPosition(11)
.table(TABLE_5)
.name("Predator")
@@ -4167,7 +4309,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(57L)
+ .id(COLUMN_5_13_ID)
.ordinalPosition(12)
.table(TABLE_5)
.name("Backbone")
@@ -4177,7 +4319,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(58L)
+ .id(COLUMN_5_14_ID)
.ordinalPosition(13)
.table(TABLE_5)
.name("Breathes")
@@ -4187,7 +4329,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(59L)
+ .id(COLUMN_5_15_ID)
.ordinalPosition(14)
.table(TABLE_5)
.name("Venomous")
@@ -4197,7 +4339,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(60L)
+ .id(COLUMN_5_16_ID)
.ordinalPosition(15)
.table(TABLE_5)
.name("Fin")
@@ -4207,7 +4349,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(61L)
+ .id(COLUMN_5_17_ID)
.ordinalPosition(16)
.table(TABLE_5)
.name("Legs")
@@ -4217,7 +4359,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(62L)
+ .id(COLUMN_5_18_ID)
.ordinalPosition(17)
.table(TABLE_5)
.name("Tail")
@@ -4227,7 +4369,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(63L)
+ .id(COLUMN_5_19_ID)
.ordinalPosition(18)
.table(TABLE_5)
.name("Domestic")
@@ -4237,7 +4379,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(64L)
+ .id(COLUMN_5_20_ID)
.ordinalPosition(19)
.table(TABLE_5)
.name("Catsize")
@@ -4247,7 +4389,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(65L)
+ .id(COLUMN_5_21_ID)
.ordinalPosition(20)
.table(TABLE_5)
.name("Class Type")
@@ -4258,7 +4400,7 @@ public abstract class BaseTest {
.build());
public final static List<ColumnDto> TABLE_5_COLUMNS_DTO = List.of(ColumnDto.builder()
- .id(45L)
+ .id(COLUMN_5_1_ID)
.ordinalPosition(0)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4269,7 +4411,7 @@ public abstract class BaseTest {
.autoGenerated(true)
.build(),
ColumnDto.builder()
- .id(46L)
+ .id(COLUMN_5_2_ID)
.ordinalPosition(1)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4280,7 +4422,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(47L)
+ .id(COLUMN_5_3_ID)
.ordinalPosition(2)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4291,7 +4433,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(48L)
+ .id(COLUMN_5_4_ID)
.ordinalPosition(3)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4302,7 +4444,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(49L)
+ .id(COLUMN_5_5_ID)
.ordinalPosition(4)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4313,7 +4455,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(50L)
+ .id(COLUMN_5_6_ID)
.ordinalPosition(5)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4324,7 +4466,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(51L)
+ .id(COLUMN_5_7_ID)
.ordinalPosition(6)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4335,7 +4477,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(52L)
+ .id(COLUMN_5_8_ID)
.ordinalPosition(7)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4346,7 +4488,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(53L)
+ .id(COLUMN_5_9_ID)
.ordinalPosition(8)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4357,7 +4499,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(54L)
+ .id(COLUMN_5_10_ID)
.ordinalPosition(9)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4368,7 +4510,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(55L)
+ .id(COLUMN_5_11_ID)
.ordinalPosition(10)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4379,7 +4521,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(56L)
+ .id(COLUMN_5_12_ID)
.ordinalPosition(11)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4390,7 +4532,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(57L)
+ .id(COLUMN_5_13_ID)
.ordinalPosition(12)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4401,7 +4543,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(58L)
+ .id(COLUMN_5_14_ID)
.ordinalPosition(13)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4412,7 +4554,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(59L)
+ .id(COLUMN_5_15_ID)
.ordinalPosition(14)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4423,7 +4565,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(60L)
+ .id(COLUMN_5_16_ID)
.ordinalPosition(15)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4434,7 +4576,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(61L)
+ .id(COLUMN_5_17_ID)
.ordinalPosition(16)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4445,7 +4587,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(62L)
+ .id(COLUMN_5_18_ID)
.ordinalPosition(17)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4456,7 +4598,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(63L)
+ .id(COLUMN_5_19_ID)
.ordinalPosition(18)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4467,7 +4609,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(64L)
+ .id(COLUMN_5_20_ID)
.ordinalPosition(19)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4478,7 +4620,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(65L)
+ .id(COLUMN_5_21_ID)
.ordinalPosition(20)
.tableId(TABLE_5_ID)
.table(TABLE_5_DTO)
@@ -4689,7 +4831,7 @@ public abstract class BaseTest {
.build());
public final static ColumnBriefDto TABLE_6_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
- .id(66L)
+ .id(67L)
.name("id")
.internalName("id")
.columnType(ColumnTypeDto.BIGINT)
@@ -4801,22 +4943,26 @@ public abstract class BaseTest {
.constraints(TABLE_6_CONSTRAINTS_CREATE)
.build();
+ public final static Long COLUMN_7_1_ID = 73L;
+
+ public final static Long COLUMN_7_2_ID = 74L;
+
public final static ColumnBriefDto TABLE_7_COLUMNS_BRIEF_0_DTO = ColumnBriefDto.builder()
- .id(26L)
+ .id(COLUMN_7_1_ID)
.name("name_id")
.internalName("name_id")
.columnType(ColumnTypeDto.BIGINT)
.build();
public final static ColumnBriefDto TABLE_7_COLUMNS_BRIEF_1_DTO = ColumnBriefDto.builder()
- .id(27L)
+ .id(COLUMN_7_2_ID)
.name("zoo_id")
.internalName("zoo_id")
.columnType(ColumnTypeDto.BIGINT)
.build();
public final static List<TableColumn> TABLE_7_COLUMNS = List.of(TableColumn.builder()
- .id(74L)
+ .id(COLUMN_7_1_ID)
.ordinalPosition(0)
.table(TABLE_7)
.name("name_id")
@@ -4826,7 +4972,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
TableColumn.builder()
- .id(75L)
+ .id(COLUMN_7_2_ID)
.ordinalPosition(1)
.table(TABLE_7)
.name("zoo_id")
@@ -4837,7 +4983,7 @@ public abstract class BaseTest {
.build());
public final static List<ColumnDto> TABLE_7_COLUMNS_DTO = List.of(ColumnDto.builder()
- .id(74L)
+ .id(COLUMN_7_1_ID)
.ordinalPosition(0)
.tableId(TABLE_7_ID)
.table(TABLE_7_DTO)
@@ -4848,7 +4994,7 @@ public abstract class BaseTest {
.autoGenerated(false)
.build(),
ColumnDto.builder()
- .id(75L)
+ .id(COLUMN_7_2_ID)
.ordinalPosition(1)
.tableId(TABLE_7_ID)
.table(TABLE_7_DTO)
@@ -4902,8 +5048,7 @@ public abstract class BaseTest {
.size(22L)
.isNullAllowed(true)
.autoGenerated(false)
- .build()
- );
+ .build() );
public final static View VIEW_1 = View.builder()
.id(VIEW_1_ID)
diff --git a/dbrepo-ui/locales/en-US.json b/dbrepo-ui/locales/en-US.json
index 847bf3652b8c507b1a6be7b9e1553b2cd5dfb91c..6abf715bc0ea6b7e8756acb78141672758ef9b54 100644
--- a/dbrepo-ui/locales/en-US.json
+++ b/dbrepo-ui/locales/en-US.json
@@ -1082,7 +1082,8 @@
},
"container": {
"exists": "Container already exists in metadata database",
- "missing": "Failed to find container in metadata database"
+ "missing": "Failed to find container in metadata database",
+ "quota": "Database quota exceeded in engine"
},
"data": {
"connection": "Failed to contact data service",
diff --git a/lib/python/tests/test_unit_query.py b/lib/python/tests/test_unit_query.py
index e5448c8a3774e4625c9992ce9c09ff79a18b83a0..e1b326fa576b86519e6c059abd73f66dacbda2e5 100644
--- a/lib/python/tests/test_unit_query.py
+++ b/lib/python/tests/test_unit_query.py
@@ -1,6 +1,4 @@
import unittest
-from json import dumps
-from typing import Any
import requests_mock
import datetime