diff --git a/.github/workflows/ci-spring-data-jdbc.yaml b/.github/workflows/ci-spring-data-jdbc-ydb.yaml similarity index 88% rename from .github/workflows/ci-spring-data-jdbc.yaml rename to .github/workflows/ci-spring-data-jdbc-ydb.yaml index 29503c9..334b496 100644 --- a/.github/workflows/ci-spring-data-jdbc.yaml +++ b/.github/workflows/ci-spring-data-jdbc-ydb.yaml @@ -3,12 +3,12 @@ name: Spring Data JDBC YDB Dialect CI with Maven on: push: paths: - - 'spring-data-dialect/**' + - 'spring-data-jdbc-ydb/**' branches: - main pull_request: paths: - - 'spring-data-dialect/**' + - 'spring-data-jdbc-ydb/**' env: MAVEN_ARGS: --batch-mode --update-snapshots -Dstyle.color=always @@ -33,17 +33,17 @@ jobs: cache: maven - name: Extract spring-data-jdbc YDB dialect version - working-directory: ./spring-data-dialect + working-directory: ./spring-data-jdbc-ydb run: | VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) echo "SPRING_DATA_JDBC_DIALECT_VERSION=$VERSION" >> "$GITHUB_ENV" - name: Download spring-data-jdbc YDB dialect dependencies - working-directory: ./spring-data-dialect + working-directory: ./spring-data-jdbc-ydb run: mvn $MAVEN_ARGS dependency:go-offline - name: Build spring-data-jdbc YDB dialect - working-directory: ./spring-data-dialect + working-directory: ./spring-data-jdbc-ydb run: mvn $MAVEN_ARGS install # - uses: actions/checkout@v4 diff --git a/.github/workflows/publish-spring-data-jdbc-dialect.yaml b/.github/workflows/publish-spring-data-jdbc-ydb.yaml similarity index 94% rename from .github/workflows/publish-spring-data-jdbc-dialect.yaml rename to .github/workflows/publish-spring-data-jdbc-ydb.yaml index f117035..2e14480 100644 --- a/.github/workflows/publish-spring-data-jdbc-dialect.yaml +++ b/.github/workflows/publish-spring-data-jdbc-ydb.yaml @@ -18,7 +18,7 @@ jobs: - name: Extract spring-data-jdbc YDB dialect version run: | - cd spring-data-dialect + cd spring-data-jdbc-ydb SPRING_DATA_JDBC_DIALECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) echo "SPRING_DATA_JDBC_DIALECT_VERSION=SPRING_DATA_JDBC_DIALECT_VERSION" >> "$GITHUB_ENV" @@ -43,12 +43,12 @@ jobs: - name: Download dependencies run: | - cd spring-data-dialect + cd spring-data-jdbc-ydb mvn $MAVEN_ARGS dependency:go-offline - name: Build with Maven run: | - cd spring-data-dialect + cd spring-data-jdbc-ydb mvn $MAVEN_ARGS package publish: @@ -78,7 +78,7 @@ jobs: - name: Publish package run: | - cd spring-data-dialect + cd spring-data-jdbc-ydb mvn $MAVEN_ARGS -Possrh-s01 -Dgpg.passphrase=${{ secrets.MAVEN_OSSRH_GPG_PASSWORD }} clean deploy env: MAVEN_USERNAME: ${{ secrets.MAVEN_OSSRH_USERNAME }} diff --git a/spring-data-dialect/README.md b/spring-data-dialect/README.md deleted file mode 100644 index 8e507c0..0000000 --- a/spring-data-dialect/README.md +++ /dev/null @@ -1 +0,0 @@ -# YDB Spring Data Dialect diff --git a/spring-data-jdbc-ydb/README.md b/spring-data-jdbc-ydb/README.md new file mode 100644 index 0000000..cfd65b5 --- /dev/null +++ b/spring-data-jdbc-ydb/README.md @@ -0,0 +1 @@ +# YDB Spring Data JDBC Dialect diff --git a/spring-data-dialect/pom.xml b/spring-data-jdbc-ydb/pom.xml similarity index 99% rename from spring-data-dialect/pom.xml rename to spring-data-jdbc-ydb/pom.xml index 33fa806..fa798b2 100644 --- a/spring-data-dialect/pom.xml +++ b/spring-data-jdbc-ydb/pom.xml @@ -5,7 +5,7 @@ 4.0.0 tech.ydb.dialects - spring-data-jdbc-ydb-dialect + spring-data-jdbc-ydb 0.9.1 Spring Data JDBC YDB Dialect diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/core/convert/YQLType.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/convert/YQLType.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/core/convert/YQLType.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/convert/YQLType.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/core/convert/YdbMappingJdbcConverter.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/convert/YdbMappingJdbcConverter.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/core/convert/YdbMappingJdbcConverter.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/convert/YdbMappingJdbcConverter.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/core/convert/YdbType.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/convert/YdbType.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/core/convert/YdbType.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/convert/YdbType.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/core/convert/package-info.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/convert/package-info.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/core/convert/package-info.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/convert/package-info.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/core/dialect/YdbDialect.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/dialect/YdbDialect.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/core/dialect/YdbDialect.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/dialect/YdbDialect.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/core/dialect/package-info.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/dialect/package-info.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/core/dialect/package-info.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/core/dialect/package-info.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/repository/ViewIndex.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/ViewIndex.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/repository/ViewIndex.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/ViewIndex.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/repository/config/AbstractYdbJdbcConfiguration.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/config/AbstractYdbJdbcConfiguration.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/repository/config/AbstractYdbJdbcConfiguration.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/config/AbstractYdbJdbcConfiguration.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/repository/config/YdbDialectProvider.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/config/YdbDialectProvider.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/repository/config/YdbDialectProvider.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/config/YdbDialectProvider.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/repository/config/package-info.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/config/package-info.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/repository/config/package-info.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/config/package-info.java diff --git a/spring-data-dialect/src/main/java/tech/ydb/data/repository/package-info.java b/spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/package-info.java similarity index 100% rename from spring-data-dialect/src/main/java/tech/ydb/data/repository/package-info.java rename to spring-data-jdbc-ydb/src/main/java/tech/ydb/data/repository/package-info.java diff --git a/spring-data-dialect/src/main/resources/META-INF/spring.factories b/spring-data-jdbc-ydb/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-data-dialect/src/main/resources/META-INF/spring.factories rename to spring-data-jdbc-ydb/src/main/resources/META-INF/spring.factories diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/YdbBaseTest.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/YdbBaseTest.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/YdbBaseTest.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/YdbBaseTest.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/YdbJdbcConfiguration.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/YdbJdbcConfiguration.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/YdbJdbcConfiguration.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/YdbJdbcConfiguration.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/all_types_table/AllTypesTableTest.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/all_types_table/AllTypesTableTest.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/all_types_table/AllTypesTableTest.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/all_types_table/AllTypesTableTest.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/all_types_table/entity/AllTypesEntity.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/all_types_table/entity/AllTypesEntity.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/all_types_table/entity/AllTypesEntity.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/all_types_table/entity/AllTypesEntity.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/all_types_table/repository/AllTypesEntityRepository.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/all_types_table/repository/AllTypesEntityRepository.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/all_types_table/repository/AllTypesEntityRepository.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/all_types_table/repository/AllTypesEntityRepository.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/books/RepositoriesIntegrationTest.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/RepositoriesIntegrationTest.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/books/RepositoriesIntegrationTest.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/RepositoriesIntegrationTest.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/books/entity/Author.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/entity/Author.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/books/entity/Author.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/entity/Author.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/books/entity/Book.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/entity/Book.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/books/entity/Book.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/entity/Book.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/books/entity/BookAuthor.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/entity/BookAuthor.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/books/entity/BookAuthor.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/entity/BookAuthor.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/books/entity/Review.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/entity/Review.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/books/entity/Review.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/entity/Review.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/books/repository/AuthorRepository.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/repository/AuthorRepository.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/books/repository/AuthorRepository.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/repository/AuthorRepository.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/books/repository/BookRepository.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/repository/BookRepository.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/books/repository/BookRepository.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/repository/BookRepository.java diff --git a/spring-data-dialect/src/test/java/tech/ydb/data/books/repository/ReviewRepository.java b/spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/repository/ReviewRepository.java similarity index 100% rename from spring-data-dialect/src/test/java/tech/ydb/data/books/repository/ReviewRepository.java rename to spring-data-jdbc-ydb/src/test/java/tech/ydb/data/books/repository/ReviewRepository.java diff --git a/spring-data-dialect/src/test/resources/application.properties b/spring-data-jdbc-ydb/src/test/resources/application.properties similarity index 100% rename from spring-data-dialect/src/test/resources/application.properties rename to spring-data-jdbc-ydb/src/test/resources/application.properties diff --git a/spring-data-dialect/src/test/resources/changelogs/all_types_table.yaml b/spring-data-jdbc-ydb/src/test/resources/changelogs/all_types_table.yaml similarity index 100% rename from spring-data-dialect/src/test/resources/changelogs/all_types_table.yaml rename to spring-data-jdbc-ydb/src/test/resources/changelogs/all_types_table.yaml diff --git a/spring-data-dialect/src/test/resources/changelogs/books.yaml b/spring-data-jdbc-ydb/src/test/resources/changelogs/books.yaml similarity index 100% rename from spring-data-dialect/src/test/resources/changelogs/books.yaml rename to spring-data-jdbc-ydb/src/test/resources/changelogs/books.yaml diff --git a/spring-data-dialect/src/test/resources/changelogs/changelog.yaml b/spring-data-jdbc-ydb/src/test/resources/changelogs/changelog.yaml similarity index 100% rename from spring-data-dialect/src/test/resources/changelogs/changelog.yaml rename to spring-data-jdbc-ydb/src/test/resources/changelogs/changelog.yaml diff --git a/spring-data-dialect/src/test/resources/changelogs/insert.sql b/spring-data-jdbc-ydb/src/test/resources/changelogs/insert.sql similarity index 100% rename from spring-data-dialect/src/test/resources/changelogs/insert.sql rename to spring-data-jdbc-ydb/src/test/resources/changelogs/insert.sql diff --git a/spring-data-dialect/src/test/resources/changelogs/insert_all_types_table.csv b/spring-data-jdbc-ydb/src/test/resources/changelogs/insert_all_types_table.csv similarity index 100% rename from spring-data-dialect/src/test/resources/changelogs/insert_all_types_table.csv rename to spring-data-jdbc-ydb/src/test/resources/changelogs/insert_all_types_table.csv