Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ jobs:
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
- name: Cache Maven dependencies
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
cache: 'maven'
- name: Execute tests
run: mvn verify
- name: check license header is present in all files
run: mvn license:check
- name: Upload Maven Timeline
if: always()
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
with:
name: maven-timeline-java-${{ matrix.java }}
path: target/timeline/
- name: Upload coverage to Codecov
uses: codecov/codecov-action@75cd11691c0faa626561e295848008c8a7dddffe # v5
8 changes: 8 additions & 0 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension>
<groupId>io.takari.maven</groupId>
<artifactId>maven-timeline</artifactId>
<version>2.0.4</version>
</extension>
</extensions>
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<license.dir>${basedir}</license.dir>
<currentYear>2022</currentYear>
<project.build.outputTimestamp>10</project.build.outputTimestamp>
<testcontainers.version>1.17.3</testcontainers.version>
<testcontainers.version>1.21.4</testcontainers.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -259,7 +259,7 @@
</plugin>
<plugin>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<version>3.6.2</version>
<executions>
<execution>
<id>enforce-bytecode-version</id>
Expand All @@ -284,7 +284,7 @@
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.2</version>
<version>1.12.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/qstd/QuickSqlTestData.java
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,18 @@ public String generateInsertScriptFor(String... sqlQueries) {
return generateInsertScriptFor(queries);
}

/**
* Generates an SQL insertion script from a DatasetRow object. This script contains INSERT
* statements taking into account the database integrity constraints.
*
* @param datasetRow A dataset row
* @return An SQL script allowing to create in database the dataset row given in parameter
*/
public String generateInsertScriptFor(DatasetRow datasetRow) {
SqlQuery sqlQuery = SqlQuery.buildFromRow(datasetRow, dbType);
return generateInsertScriptFor(sqlQuery.toString());
}

/**
* Generates a list of INSERT statements allowing to create in database the dataset row given in
* parameter. These INSERT statements take into account the database integrity constraints.
Expand Down
33 changes: 33 additions & 0 deletions src/test/java/org/qstd/test/DatasetRowApiTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,39 @@

public class DatasetRowApiTest extends H2Config {

@Test
public void should_generate_an_insert_script_from_a_dataset_row() {

// GIVEN
TestTable playerTable =
buildUniqueTable(
DATA_SOURCE,
"Player",
" id bigint" + ", firstName varchar(255)" + ", lastName varchar(255)")
.create()
.insertValues("1, 'Paul', 'Pogba'");

DatasetRow datasetRow =
DatasetRow.ofTable(playerTable.getTableName())
.addColumnValue("id", 1)
.addColumnValue("firstName", "Paul")
.addColumnValue("lastName", "Pogba");

QuickSqlTestData quickSqlTestData = QuickSqlTestData.buildFrom(DATA_SOURCE);

// WHEN
String insertScript = quickSqlTestData.generateInsertScriptFor(datasetRow);

// THEN
playerTable.recreate();
SQL_EXECUTOR.execute(insertScript);
assertThat(playerTable)
.withScript(insertScript)
.hasNumberOfRows(1)
.row(0)
.hasValues(1, "Paul", "Pogba");
}

@Test
public void should_generate_working_insert_from_a_dataset_row() {

Expand Down
3 changes: 1 addition & 2 deletions src/test/java/org/qstd/test/MSSQLServerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
public class MSSQLServerTest {

private static final MSSQLServerContainer MS_SQL_SERVER =
new MSSQLServerContainer("mcr.microsoft.com/mssql/server:2019-CU9-ubuntu-16.04")
.acceptLicense();
new MSSQLServerContainer<>("mcr.microsoft.com/mssql/server:2022-latest").acceptLicense();

private static DataSource DATA_SOURCE;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/qstd/test/MariaDBSlowTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class MariaDBSlowTest {
private static final String DB_PASSWORD = "pwd";

private static final MariaDBContainer MARIA_DB_CONTAINER =
new MariaDBContainer<>("mariadb:10.5.2")
new MariaDBContainer<>("mariadb:11.4")
.withDatabaseName("mariadb")
.withUsername(DB_USER_NAME)
.withPassword(DB_PASSWORD);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/qstd/test/MariaDBTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class MariaDBTest {
private static final String DB_PASSWORD = "pwd";

private static final MariaDBContainer MARIA_DB_CONTAINER =
new MariaDBContainer<>("mariadb:10.5.2")
new MariaDBContainer<>("mariadb:11.4")
.withDatabaseName("mariadb")
.withUsername(DB_USER_NAME)
.withPassword(DB_PASSWORD);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/qstd/test/OracleTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class OracleTest {
private static DataSource DATA_SOURCE;

private static final OracleContainer ORACLE_CONTAINER =
new OracleContainer("gvenzl/oracle-xe:18-slim").withEnv("ORACLE_PASSWORD", "oracle");
new OracleContainer("gvenzl/oracle-xe:21.3.0-slim").withEnv("ORACLE_PASSWORD", "oracle");

private static SqlExecutor SQL_EXECUTOR;

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/qstd/test/PostgreSqlTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class PostgreSqlTest {
private static final String DB_PASSWORD = "pwd";

private static final PostgreSQLContainer POSTGRESQL_CONTAINER =
new PostgreSQLContainer<>("postgres:12.3")
new PostgreSQLContainer<>("postgres:17")
.withDatabaseName("postgresql")
.withUsername(DB_USER_NAME)
.withPassword(DB_PASSWORD);
Expand Down
Loading