Skip to content

Commit af561a3

Browse files
committed
Merge branch 'DBTOOLS-2013_jdbc_fix' into 'master'
DBTOOLS-2013 fixed parsing error See merge request codekeeper/pgcodekeeper-cli!32
2 parents 1f928e5 + 260c1e2 commit af561a3

5 files changed

Lines changed: 14 additions & 3 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
/.idea/
22
/target/
3+
/.settings/
4+
/.project
5+
/.classpath

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1717

1818
### Fixed
1919

20+
- Fixed a bug when parsing the connection string for MS SQL.
21+
2022
## [14.0.0] - 2026-02-25
2123

2224
### Added

CHANGELOG.ru.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
### Исправлено
1919

20+
- Исправлена ​​ошибка при парсинге строки подключения для MS SQL.
21+
2022
## [14.0.0] - 2026-02-25
2123

2224
### Добавлено

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@
138138
<id>jenkins</id>
139139
<build>
140140
<plugins>
141+
<plugin>
142+
<groupId>org.sonarsource.scanner.maven</groupId>
143+
<artifactId>sonar-maven-plugin</artifactId>
144+
<version>5.5.0.6356</version>
145+
</plugin>
141146
<plugin>
142147
<groupId>org.jacoco</groupId>
143148
<artifactId>jacoco-maven-plugin</artifactId>

src/main/java/org/pgcodekeeper/cli/PgDiffCli.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,10 @@ public ILoader getDatabaseLoader(String srcPath, Collection<String> libXmls, Col
8484
Collection<String> libsWithoutPriv) {
8585
IDatabaseProvider provider = arguments.getProvider();
8686

87-
final Path actualPath = Paths.get(srcPath);
8887
return switch (SourceFormat.parsePath(srcPath)) {
8988
case DB -> provider.getJdbcLoader(srcPath, diffSettings);
90-
case DUMP -> provider.getDumpLoader(actualPath, diffSettings);
91-
case PARSED -> provider.getProjectLoader(actualPath, diffSettings, libXmls, libs, libsWithoutPriv,
89+
case DUMP -> provider.getDumpLoader(Paths.get(srcPath), diffSettings);
90+
case PARSED -> provider.getProjectLoader(Paths.get(srcPath), diffSettings, libXmls, libs, libsWithoutPriv,
9291
Utils.getMetaPath());
9392
};
9493
}

0 commit comments

Comments
 (0)