refactor: extract sql-lib and sql-testfixtures modules (#4653)

eclipse-edc · Dec 3, 2024 · ebd43aa · ebd43aa
1 parent 0dc4cdb
commit ebd43aa
Show file tree

Hide file tree

Showing 82 changed files with 139 additions and 85 deletions.
diff --git a/core/common/lib/sql-lib/build.gradle.kts b/core/common/lib/sql-lib/build.gradle.kts
@@ -0,0 +1,29 @@
+/*
+ *  Copyright (c) 2024 Cofinity-X
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Cofinity-X - initial API and implementation
+ *
+ */
+
+plugins {
+    `java-library`
+}
+
+dependencies {
+    api(project(":spi:common:core-spi"))
+    api(project(":spi:common:transaction-datasource-spi"))
+    api(project(":spi:common:transaction-spi"))
+    implementation(project(":core:common:lib:util-lib"))
+
+    testImplementation(project(":core:common:junit"))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
+}
+
+
diff --git a/.../org/eclipse/edc/sql/ArgumentHandler.java → .../org/eclipse/edc/sql/ArgumentHandler.java b/.../org/eclipse/edc/sql/ArgumentHandler.java → .../org/eclipse/edc/sql/ArgumentHandler.java
diff --git a/...org/eclipse/edc/sql/ArgumentHandlers.java → ...org/eclipse/edc/sql/ArgumentHandlers.java b/...org/eclipse/edc/sql/ArgumentHandlers.java → ...org/eclipse/edc/sql/ArgumentHandlers.java
diff --git a/...rg/eclipse/edc/sql/ConnectionFactory.java → ...rg/eclipse/edc/sql/ConnectionFactory.java b/...rg/eclipse/edc/sql/ConnectionFactory.java → ...rg/eclipse/edc/sql/ConnectionFactory.java
diff --git a/.../java/org/eclipse/edc/sql/DoorKeeper.java → .../java/org/eclipse/edc/sql/DoorKeeper.java b/.../java/org/eclipse/edc/sql/DoorKeeper.java → .../java/org/eclipse/edc/sql/DoorKeeper.java
diff --git a/...c/sql/DriverManagerConnectionFactory.java → ...c/sql/DriverManagerConnectionFactory.java b/...c/sql/DriverManagerConnectionFactory.java → ...c/sql/DriverManagerConnectionFactory.java
diff --git a/...va/org/eclipse/edc/sql/QueryExecutor.java → ...va/org/eclipse/edc/sql/QueryExecutor.java b/...va/org/eclipse/edc/sql/QueryExecutor.java → ...va/org/eclipse/edc/sql/QueryExecutor.java
diff --git a/.../org/eclipse/edc/sql/ResultSetMapper.java → .../org/eclipse/edc/sql/ResultSetMapper.java b/.../org/eclipse/edc/sql/ResultSetMapper.java → .../org/eclipse/edc/sql/ResultSetMapper.java
diff --git a/...org/eclipse/edc/sql/SqlQueryExecutor.java → ...org/eclipse/edc/sql/SqlQueryExecutor.java b/...org/eclipse/edc/sql/SqlQueryExecutor.java → ...org/eclipse/edc/sql/SqlQueryExecutor.java
diff --git a/...dc/sql/SqlQueryExecutorConfiguration.java → ...dc/sql/SqlQueryExecutorConfiguration.java b/...dc/sql/SqlQueryExecutorConfiguration.java → ...dc/sql/SqlQueryExecutorConfiguration.java
@@ -14,13 +14,13 @@
 
 package org.eclipse.edc.sql;
 
-import static org.eclipse.edc.sql.SqlCoreExtension.DEFAULT_EDC_SQL_FETCH_SIZE;
-
 /**
  * Configuration class for {@link SqlQueryExecutor}
  */
 public record SqlQueryExecutorConfiguration(int fetchSize) {
 
+    public static final String DEFAULT_EDC_SQL_FETCH_SIZE = "5000";
+
     public static SqlQueryExecutorConfiguration ofDefaults() {
         return new SqlQueryExecutorConfiguration(Integer.parseInt(DEFAULT_EDC_SQL_FETCH_SIZE));
     }

diff --git a/...tasource/ConnectionFactoryDataSource.java → ...tasource/ConnectionFactoryDataSource.java b/...tasource/ConnectionFactoryDataSource.java → ...tasource/ConnectionFactoryDataSource.java
diff --git a/.../datasource/ConnectionPoolDataSource.java → .../datasource/ConnectionPoolDataSource.java b/.../datasource/ConnectionPoolDataSource.java → .../datasource/ConnectionPoolDataSource.java
diff --git a/...atasource/PooledDataSourceConnection.java → ...atasource/PooledDataSourceConnection.java b/...atasource/PooledDataSourceConnection.java → ...atasource/PooledDataSourceConnection.java
diff --git a/...ipse/edc/sql/dialect/PostgresDialect.java → ...ipse/edc/sql/dialect/PostgresDialect.java b/...ipse/edc/sql/dialect/PostgresDialect.java → ...ipse/edc/sql/dialect/PostgresDialect.java
diff --git a/.../eclipse/edc/sql/pool/ConnectionPool.java → .../eclipse/edc/sql/pool/ConnectionPool.java b/.../eclipse/edc/sql/pool/ConnectionPool.java → .../eclipse/edc/sql/pool/ConnectionPool.java
diff --git a/...clipse/edc/sql/statement/ColumnEntry.java → ...clipse/edc/sql/statement/ColumnEntry.java b/...clipse/edc/sql/statement/ColumnEntry.java → ...clipse/edc/sql/statement/ColumnEntry.java
diff --git a/...dc/sql/statement/SqlExecuteStatement.java → ...dc/sql/statement/SqlExecuteStatement.java b/...dc/sql/statement/SqlExecuteStatement.java → ...dc/sql/statement/SqlExecuteStatement.java
diff --git a/...ipse/edc/sql/statement/SqlStatements.java → ...ipse/edc/sql/statement/SqlStatements.java b/...ipse/edc/sql/statement/SqlStatements.java → ...ipse/edc/sql/statement/SqlStatements.java
diff --git a/...lipse/edc/sql/store/AbstractSqlStore.java → ...lipse/edc/sql/store/AbstractSqlStore.java b/...lipse/edc/sql/store/AbstractSqlStore.java → ...lipse/edc/sql/store/AbstractSqlStore.java
diff --git a/...tion/CriterionToWhereClauseConverter.java → ...tion/CriterionToWhereClauseConverter.java b/...tion/CriterionToWhereClauseConverter.java → ...tion/CriterionToWhereClauseConverter.java
diff --git a/.../CriterionToWhereClauseConverterImpl.java → .../CriterionToWhereClauseConverterImpl.java b/.../CriterionToWhereClauseConverterImpl.java → .../CriterionToWhereClauseConverterImpl.java
diff --git a/.../edc/sql/translation/FieldTranslator.java → .../edc/sql/translation/FieldTranslator.java b/.../edc/sql/translation/FieldTranslator.java → .../edc/sql/translation/FieldTranslator.java
diff --git a/.../sql/translation/JsonFieldTranslator.java → .../sql/translation/JsonFieldTranslator.java b/.../sql/translation/JsonFieldTranslator.java → .../sql/translation/JsonFieldTranslator.java
diff --git a/...anslation/PlainColumnFieldTranslator.java → ...anslation/PlainColumnFieldTranslator.java b/...anslation/PlainColumnFieldTranslator.java → ...anslation/PlainColumnFieldTranslator.java
diff --git a/...slation/PostgresqlOperatorTranslator.java → ...slation/PostgresqlOperatorTranslator.java b/...slation/PostgresqlOperatorTranslator.java → ...slation/PostgresqlOperatorTranslator.java
diff --git a/...c/sql/translation/SortFieldConverter.java → ...c/sql/translation/SortFieldConverter.java b/...c/sql/translation/SortFieldConverter.java → ...c/sql/translation/SortFieldConverter.java
diff --git a/...l/translation/SortFieldConverterImpl.java → ...l/translation/SortFieldConverterImpl.java b/...l/translation/SortFieldConverterImpl.java → ...l/translation/SortFieldConverterImpl.java
diff --git a/...ipse/edc/sql/translation/SqlOperator.java → ...ipse/edc/sql/translation/SqlOperator.java b/...ipse/edc/sql/translation/SqlOperator.java → ...ipse/edc/sql/translation/SqlOperator.java
diff --git a/...ql/translation/SqlOperatorTranslator.java → ...ql/translation/SqlOperatorTranslator.java b/...ql/translation/SqlOperatorTranslator.java → ...ql/translation/SqlOperatorTranslator.java
diff --git a/...dc/sql/translation/SqlQueryStatement.java → ...dc/sql/translation/SqlQueryStatement.java b/...dc/sql/translation/SqlQueryStatement.java → ...dc/sql/translation/SqlQueryStatement.java
diff --git a/...c/sql/translation/TranslationMapping.java → ...c/sql/translation/TranslationMapping.java b/...c/sql/translation/TranslationMapping.java → ...c/sql/translation/TranslationMapping.java
diff --git a/...ipse/edc/sql/translation/WhereClause.java → ...ipse/edc/sql/translation/WhereClause.java b/...ipse/edc/sql/translation/WhereClause.java → ...ipse/edc/sql/translation/WhereClause.java
diff --git a/...a/org/eclipse/edc/sql/DoorKeeperTest.java → ...a/org/eclipse/edc/sql/DoorKeeperTest.java b/...a/org/eclipse/edc/sql/DoorKeeperTest.java → ...a/org/eclipse/edc/sql/DoorKeeperTest.java
diff --git a/.../sql/SqlQueryExecutorIntegrationTest.java → .../sql/SqlQueryExecutorIntegrationTest.java b/.../sql/SqlQueryExecutorIntegrationTest.java → .../sql/SqlQueryExecutorIntegrationTest.java
diff --git a/...eclipse/edc/sql/SqlQueryExecutorTest.java → ...eclipse/edc/sql/SqlQueryExecutorTest.java b/...eclipse/edc/sql/SqlQueryExecutorTest.java → ...eclipse/edc/sql/SqlQueryExecutorTest.java
diff --git a/...urce/ConnectionFactoryDataSourceTest.java → ...urce/ConnectionFactoryDataSourceTest.java b/...urce/ConnectionFactoryDataSourceTest.java → ...urce/ConnectionFactoryDataSourceTest.java
diff --git a/...asource/ConnectionPoolDataSourceTest.java → ...asource/ConnectionPoolDataSourceTest.java b/...asource/ConnectionPoolDataSourceTest.java → ...asource/ConnectionPoolDataSourceTest.java
diff --git a/...ource/PooledDataSourceConnectionTest.java → ...ource/PooledDataSourceConnectionTest.java b/...ource/PooledDataSourceConnectionTest.java → ...ource/PooledDataSourceConnectionTest.java
diff --git a/...ql/statement/SqlExecuteStatementTest.java → ...ql/statement/SqlExecuteStatementTest.java b/...ql/statement/SqlExecuteStatementTest.java → ...ql/statement/SqlExecuteStatementTest.java
diff --git a/...terionToWhereClauseConverterImplTest.java → ...terionToWhereClauseConverterImplTest.java b/...terionToWhereClauseConverterImplTest.java → ...terionToWhereClauseConverterImplTest.java
diff --git a/.../translation/JsonFieldTranslatorTest.java → .../translation/JsonFieldTranslatorTest.java b/.../translation/JsonFieldTranslatorTest.java → .../translation/JsonFieldTranslatorTest.java
diff --git a/...ation/PlainColumnFieldTranslatorTest.java → ...ation/PlainColumnFieldTranslatorTest.java b/...ation/PlainColumnFieldTranslatorTest.java → ...ation/PlainColumnFieldTranslatorTest.java
diff --git a/...ion/PostgresqlOperatorTranslatorTest.java → ...ion/PostgresqlOperatorTranslatorTest.java b/...ion/PostgresqlOperatorTranslatorTest.java → ...ion/PostgresqlOperatorTranslatorTest.java
diff --git a/...ql/translation/SqlQueryStatementTest.java → ...ql/translation/SqlQueryStatementTest.java b/...ql/translation/SqlQueryStatementTest.java → ...ql/translation/SqlQueryStatementTest.java
diff --git a/...ipse/edc/sql/translation/TestMapping.java → ...ipse/edc/sql/translation/TestMapping.java b/...ipse/edc/sql/translation/TestMapping.java → ...ipse/edc/sql/translation/TestMapping.java
diff --git a/...l/translation/TranslationMappingTest.java → ...l/translation/TranslationMappingTest.java b/...l/translation/TranslationMappingTest.java → ...l/translation/TranslationMappingTest.java
diff --git a/extensions/common/sql/sql-bootstrapper/build.gradle.kts b/extensions/common/sql/sql-bootstrapper/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
     api(project(":spi:common:core-spi"))
     api(project(":spi:common:transaction-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
-    implementation(project(":extensions:common:sql:sql-core")) // SqlQueryExecutor
+    implementation(project(":core:common:lib:sql-lib"))
 //
     testImplementation(project(":core:common:junit"))
     testImplementation(libs.assertj)

diff --git a/...er/src/test/java/org/eclipse/edc/sql/bootstrapper/SqlSchemaBootstrapperExtensionTest.java b/...er/src/test/java/org/eclipse/edc/sql/bootstrapper/SqlSchemaBootstrapperExtensionTest.java
@@ -14,20 +14,21 @@
 
 package org.eclipse.edc.sql.bootstrapper;
 
+import org.eclipse.edc.boot.system.injection.ObjectFactory;
 import org.eclipse.edc.junit.annotations.ComponentTest;
 import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
 import org.eclipse.edc.spi.result.Result;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;
-import org.eclipse.edc.spi.system.configuration.Config;
+import org.eclipse.edc.spi.system.configuration.ConfigFactory;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
+import java.util.Map;
+
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.eclipse.edc.sql.bootstrapper.SqlSchemaBootstrapperExtension.SCHEMA_AUTOCREATE_PROPERTY;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -46,20 +47,20 @@ void setUp(ServiceExtensionContext context) {
     }
 
     @Test
-    void prepare_autocreateDisabled(SqlSchemaBootstrapperExtension extension, ServiceExtensionContext context) {
-        var config = mock(Config.class);
-        when(config.getBoolean(eq("edc.sql.schema.autocreate"), anyBoolean())).thenReturn(false);
-        when(context.getConfig()).thenReturn(config);
+    void shouldNotCreateSchema_whenSettingIsDisabled(ObjectFactory objectFactory, ServiceExtensionContext context) {
+        var extension = objectFactory.constructInstance(SqlSchemaBootstrapperExtension.class);
+        when(context.getConfig()).thenReturn(ConfigFactory.fromMap(Map.of(SCHEMA_AUTOCREATE_PROPERTY, "false")));
+
         extension.initialize(context);
         extension.prepare();
+
         verifyNoInteractions(transactionContext);
     }
 
     @Test
-    void prepare(SqlSchemaBootstrapperExtension extension, ServiceExtensionContext context) {
-        var config = mock(Config.class);
-        when(config.getBoolean(eq(SCHEMA_AUTOCREATE_PROPERTY), anyBoolean())).thenReturn(true);
-        when(context.getConfig()).thenReturn(config);
+    void shouldCreateSchema_whenSettingIsEnabled(ServiceExtensionContext context, ObjectFactory objectFactory) {
+        when(context.getConfig()).thenReturn(ConfigFactory.fromMap(Map.of(SCHEMA_AUTOCREATE_PROPERTY, "true")));
+        var extension = objectFactory.constructInstance(SqlSchemaBootstrapperExtension.class);
         when(transactionContext.execute(isA(TransactionContext.ResultTransactionBlock.class)))
                 .thenReturn(Result.success("foobar"));
 
@@ -69,4 +70,4 @@ void prepare(SqlSchemaBootstrapperExtension extension, ServiceExtensionContext c
         verify(transactionContext).execute(isA(TransactionContext.ResultTransactionBlock.class));
     }
 
-}
+}
diff --git a/extensions/common/sql/sql-core/build.gradle.kts b/extensions/common/sql/sql-core/build.gradle.kts
@@ -22,20 +22,12 @@ plugins {
 dependencies {
     api(project(":spi:common:core-spi"))
     api(project(":spi:common:transaction-spi"))
+    api(project(":spi:common:transaction-datasource-spi"))
+    implementation(project(":core:common:lib:sql-lib"))
     implementation(project(":core:common:lib:util-lib"))
-    implementation(project(":spi:common:transaction-datasource-spi"))
-
 
     testImplementation(project(":core:common:junit"))
-    testFixturesImplementation(project(":spi:common:transaction-datasource-spi"))
-    testFixturesImplementation(project(":core:common:junit"))
-    testFixturesImplementation(libs.junit.jupiter.api)
-    testFixturesImplementation(libs.mockito.core)
-    testFixturesImplementation(libs.postgres)
-
-    testFixturesImplementation(libs.testcontainers.junit)
-    testFixturesImplementation(libs.testcontainers.postgres)
-
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
 }
 
 
diff --git a/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlCoreExtension.java b/extensions/common/sql/sql-core/src/main/java/org/eclipse/edc/sql/SqlCoreExtension.java
@@ -24,12 +24,13 @@
 import org.eclipse.edc.transaction.spi.NoopTransactionContext;
 import org.eclipse.edc.transaction.spi.TransactionContext;
 
+import static org.eclipse.edc.sql.SqlQueryExecutorConfiguration.DEFAULT_EDC_SQL_FETCH_SIZE;
+
 @Extension(value = SqlCoreExtension.NAME)
 public class SqlCoreExtension implements ServiceExtension {
 
     public static final String NAME = "SQL Core";
 
-    public static final String DEFAULT_EDC_SQL_FETCH_SIZE = "5000";
     @Setting(description = "Fetch size value used in SQL queries", defaultValue = DEFAULT_EDC_SQL_FETCH_SIZE, key = "edc.sql.fetch.size")
     private int fetchSize;
 

diff --git a/extensions/common/sql/sql-lease/build.gradle.kts b/extensions/common/sql/sql-lease/build.gradle.kts
@@ -22,16 +22,15 @@ dependencies {
     api(project(":spi:common:core-spi"))
     api(project(":spi:common:transaction-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
-    implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:lib:sql-lib"))
 
     testImplementation(project(":core:common:junit"))
     testImplementation(project(":extensions:common:transaction:transaction-local"))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-lease")))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
     testImplementation(libs.postgres)
     testImplementation(libs.assertj)
 
-    testFixturesImplementation(project(":extensions:common:sql:sql-core"))
+    testFixturesImplementation(project(":core:common:lib:sql-lib")) // TODO: these fixtures could finish in sql-testfixtures module
 }
 
 
diff --git a/extensions/common/sql/sql-pool/sql-pool-apache-commons/build.gradle.kts b/extensions/common/sql/sql-pool/sql-pool-apache-commons/build.gradle.kts
@@ -21,7 +21,8 @@ plugins {
 
 dependencies {
     api(project(":spi:common:transaction-datasource-spi"))
-    api(project(":extensions:common:sql:sql-core"))
+
+    implementation(project(":core:common:lib:sql-lib"))
 
     implementation(libs.apache.commons.pool)
 

diff --git a/extensions/common/sql/sql-test-fixtures/build.gradle.kts b/extensions/common/sql/sql-test-fixtures/build.gradle.kts
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2024 Cofinity-X
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Cofinity-X - Initial build file
+ *
+ */
+
+plugins {
+    `java-library`
+    `java-test-fixtures`
+}
+
+dependencies {
+    testFixturesImplementation(project(":spi:common:core-spi"))
+    testFixturesImplementation(project(":spi:common:transaction-datasource-spi"))
+    testFixturesImplementation(project(":spi:common:transaction-spi"))
+    testFixturesImplementation(project(":core:common:junit"))
+    testFixturesImplementation(project(":core:common:lib:sql-lib"))
+    testFixturesImplementation(project(":extensions:common:sql:sql-lease"))
+
+    testFixturesImplementation(libs.junit.jupiter.api)
+    testFixturesImplementation(libs.mockito.core)
+    testFixturesImplementation(libs.postgres)
+    testFixturesImplementation(libs.testcontainers.junit)
+    testFixturesImplementation(libs.testcontainers.postgres)
+}
+
+
diff --git a/...edc/sql/lease/testfixtures/LeaseUtil.java → ...lipse/edc/sql/testfixtures/LeaseUtil.java b/...edc/sql/lease/testfixtures/LeaseUtil.java → ...lipse/edc/sql/testfixtures/LeaseUtil.java
@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.sql.lease.testfixtures;
+package org.eclipse.edc.sql.testfixtures;
 
 import org.eclipse.edc.sql.SqlQueryExecutor;
 import org.eclipse.edc.sql.lease.LeaseStatements;

diff --git a/...tfixtures/PostgresqlEndToEndInstance.java → ...tfixtures/PostgresqlEndToEndInstance.java b/...tfixtures/PostgresqlEndToEndInstance.java → ...tfixtures/PostgresqlEndToEndInstance.java
diff --git a/...testfixtures/PostgresqlLocalInstance.java → ...testfixtures/PostgresqlLocalInstance.java b/...testfixtures/PostgresqlLocalInstance.java → ...testfixtures/PostgresqlLocalInstance.java
diff --git a/...xtures/PostgresqlStoreSetupExtension.java → ...xtures/PostgresqlStoreSetupExtension.java b/...xtures/PostgresqlStoreSetupExtension.java → ...xtures/PostgresqlStoreSetupExtension.java
diff --git a/extensions/common/store/sql/edr-index-sql/build.gradle.kts b/extensions/common/store/sql/edr-index-sql/build.gradle.kts
@@ -20,12 +20,12 @@ dependencies {
     api(project(":spi:common:core-spi"))
     api(project(":spi:common:transaction-spi"))
 
-    implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:lib:sql-lib"))
     implementation(project(":extensions:common:sql:sql-bootstrapper"))
     implementation(project(":spi:common:edr-store-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
     testImplementation(project(":core:common:junit"))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
     testImplementation(testFixtures(project(":spi:common:edr-store-spi")))
 
-}
+}
diff --git a/extensions/common/store/sql/jti-validation-store-sql/build.gradle.kts b/extensions/common/store/sql/jti-validation-store-sql/build.gradle.kts
@@ -20,11 +20,11 @@ dependencies {
     api(project(":spi:common:jwt-spi"))
     api(project(":spi:common:transaction-spi"))
 
-    implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:lib:sql-lib"))
     implementation(project(":extensions:common:sql:sql-bootstrapper"))
     implementation(project(":spi:common:transaction-datasource-spi"))
     testImplementation(project(":core:common:junit"))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
     testImplementation(testFixtures(project(":spi:common:jwt-spi")))
 
-}
+}
diff --git a/extensions/common/store/sql/sts-client-store-sql/build.gradle.kts b/extensions/common/store/sql/sts-client-store-sql/build.gradle.kts
@@ -20,12 +20,12 @@ dependencies {
     api(project(":spi:common:core-spi"))
     api(project(":spi:common:transaction-spi"))
 
-    implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:lib:sql-lib"))
     implementation(project(":extensions:common:sql:sql-bootstrapper"))
     implementation(project(":spi:common:identity-trust-sts-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
     testImplementation(project(":core:common:junit"))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
     testImplementation(testFixtures(project(":spi:common:identity-trust-sts-spi")))
 
-}
+}
diff --git a/extensions/common/transaction/transaction-local/build.gradle.kts b/extensions/common/transaction/transaction-local/build.gradle.kts
@@ -24,7 +24,7 @@ dependencies {
 
     testImplementation(project(":tests:junit-base"));
 
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
 }
 
 
diff --git a/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts b/extensions/control-plane/store/sql/asset-index-sql/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     api(project(":spi:control-plane:asset-spi"))
 
     implementation(project(":spi:common:transaction-datasource-spi"))
-    implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:lib:sql-lib"))
     implementation(project(":extensions:common:sql:sql-bootstrapper"))
     implementation(project(":core:common:lib:util-lib"))
 
@@ -32,7 +32,7 @@ dependencies {
     testImplementation(project(":spi:common:policy-model"))
     testImplementation(libs.assertj)
     testImplementation(testFixtures(project(":spi:control-plane:asset-spi")))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
     testImplementation(libs.postgres)
 
     testImplementation(libs.testcontainers.junit)

diff --git a/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/contract-definition-store-sql/build.gradle.kts
@@ -22,13 +22,13 @@ dependencies {
     api(project(":spi:control-plane:contract-spi"))
     api(project(":spi:common:transaction-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
-    implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:lib:sql-lib"))
     implementation(project(":extensions:common:sql:sql-bootstrapper"))
 
     testImplementation(project(":core:common:junit"))
     testImplementation(project(":spi:common:policy-model"))
     testImplementation(libs.assertj)
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
     testImplementation(testFixtures(project(":spi:control-plane:contract-spi")))
     testImplementation(libs.postgres)
 }

diff --git a/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/contract-negotiation-store-sql/build.gradle.kts
@@ -22,16 +22,15 @@ dependencies {
     api(project(":spi:control-plane:contract-spi"))
     api(project(":spi:common:transaction-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
-    implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:lib:sql-lib"))
     implementation(project(":extensions:common:sql:sql-lease"))
     implementation(project(":extensions:common:sql:sql-bootstrapper"))
 
 
     testImplementation(project(":core:common:junit"))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-lease")))
     testImplementation(libs.assertj)
     testImplementation(testFixtures(project(":spi:control-plane:contract-spi")))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
     testImplementation(libs.postgres)
 }
 

diff --git a/...ontrolplane/store/sql/contractnegotiation/store/PostgresContractNegotiationStoreTest.java b/...ontrolplane/store/sql/contractnegotiation/store/PostgresContractNegotiationStoreTest.java
@@ -21,7 +21,7 @@
 import org.eclipse.edc.junit.testfixtures.TestUtils;
 import org.eclipse.edc.policy.model.PolicyRegistrationTypes;
 import org.eclipse.edc.sql.QueryExecutor;
-import org.eclipse.edc.sql.lease.testfixtures.LeaseUtil;
+import org.eclipse.edc.sql.testfixtures.LeaseUtil;
 import org.eclipse.edc.sql.testfixtures.PostgresqlStoreSetupExtension;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/extensions/control-plane/store/sql/control-plane-sql/build.gradle.kts b/extensions/control-plane/store/sql/control-plane-sql/build.gradle.kts
@@ -30,7 +30,7 @@ dependencies {
     testImplementation(project(":core:control-plane:control-plane-catalog"))
     testImplementation(project(":core:control-plane:control-plane-contract"))
     testImplementation(project(":core:control-plane:control-plane-core"))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
 }
 
 
diff --git a/extensions/control-plane/store/sql/policy-definition-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/policy-definition-store-sql/build.gradle.kts
@@ -22,14 +22,14 @@ dependencies {
     api(project(":spi:control-plane:contract-spi"))
     api(project(":spi:common:transaction-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
-    implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:lib:sql-lib"))
     implementation(project(":extensions:common:sql:sql-bootstrapper"))
 
 
     testImplementation(project(":core:common:junit"))
     testImplementation(libs.postgres)
     testImplementation(testFixtures(project(":spi:control-plane:policy-spi")))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
 }
 
 
diff --git a/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts b/extensions/control-plane/store/sql/transfer-process-store-sql/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
     api(project(":spi:control-plane:transfer-spi"))
     api(project(":spi:common:transaction-spi"))
     implementation(project(":spi:common:transaction-datasource-spi"))
-    implementation(project(":extensions:common:sql:sql-core"))
+    implementation(project(":core:common:lib:sql-lib"))
     implementation(project(":extensions:common:sql:sql-lease"))
     implementation(project(":extensions:common:sql:sql-bootstrapper"))
 
@@ -32,8 +32,7 @@ dependencies {
     testImplementation(libs.awaitility)
     testImplementation(libs.postgres)
     testImplementation(testFixtures(project(":spi:control-plane:transfer-spi")))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-lease")))
-    testImplementation(testFixtures(project(":extensions:common:sql:sql-core")))
+    testImplementation(testFixtures(project(":extensions:common:sql:sql-test-fixtures")))
 
 }