Skip to content

Commit 03e27a9

Browse files
sualehsualeh
committed
v16.16.02
1 parent ac48400 commit 03e27a9

File tree

8 files changed

+59
-85
lines changed

8 files changed

+59
-85
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.fatehi</groupId>
88
<artifactId>schemacrawler-parent</artifactId>
9-
<version>16.15.11</version>
9+
<version>16.16.02</version>
1010
</parent>
1111
<artifactId>schemacrawler-database-plugins-parent</artifactId>
1212
<packaging>pom</packaging>

‎schemacrawler-hana/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.fatehi</groupId>
88
<artifactId>schemacrawler-parent</artifactId>
9-
<version>16.15.11</version>
9+
<version>16.16.02</version>
1010
</parent>
1111
<artifactId>schemacrawler-hana</artifactId>
1212
<packaging>jar</packaging>
@@ -21,6 +21,7 @@
2121
<groupId>us.fatehi</groupId>
2222
<artifactId>schemacrawler-commandline</artifactId>
2323
<version>${project.version}</version>
24+
<scope>test</scope>
2425
</dependency>
2526

2627
<dependency>

‎schemacrawler-hana/src/main/java/schemacrawler/tools/hana/HanaDatabaseConnector.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
package schemacrawler.tools.hana;
3030

31-
import java.io.IOException;
3231
import java.util.logging.Level;
3332
import java.util.logging.Logger;
3433

@@ -41,14 +40,14 @@ public final class HanaDatabaseConnector extends DatabaseConnector {
4140

4241
private static final Logger LOGGER = Logger.getLogger(HanaDatabaseConnector.class.getName());
4342

44-
public HanaDatabaseConnector() throws IOException {
43+
public HanaDatabaseConnector() {
4544
super(
4645
new DatabaseServerType("hana", "SAP HANA"),
4746
url -> url != null && url.startsWith("jdbc:sap:"),
4847
(informationSchemaViewsBuilder, connection) ->
4948
informationSchemaViewsBuilder.fromResourceFolder("/hana.information_schema"),
5049
(schemaRetrievalOptionsBuilder, connection) -> {},
51-
(limitOptionsBuilder) -> {},
50+
limitOptionsBuilder -> {},
5251
() ->
5352
DatabaseConnectionUrlBuilder.builder(
5453
"jdbc:sap://${host}:${port}/?databaseName=${database}")

‎schemacrawler-sapiq/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>us.fatehi</groupId>
99
<artifactId>schemacrawler-parent</artifactId>
10-
<version>16.15.11</version>
10+
<version>16.16.02</version>
1111
</parent>
1212
<artifactId>schemacrawler-sapiq</artifactId>
1313
<packaging>jar</packaging>
@@ -22,6 +22,7 @@
2222
<groupId>us.fatehi</groupId>
2323
<artifactId>schemacrawler-commandline</artifactId>
2424
<version>${project.version}</version>
25+
<scope>test</scope>
2526
</dependency>
2627

2728
<dependency>

‎schemacrawler-sapiq/src/main/java/schemacrawler/server/sapiq/SAPIQDatabaseConnector.java‎

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,47 +28,35 @@
2828

2929
package schemacrawler.server.sapiq;
3030

31-
32-
import java.io.IOException;
3331
import schemacrawler.schemacrawler.DatabaseServerType;
3432
import schemacrawler.tools.databaseconnector.DatabaseConnectionUrlBuilder;
3533
import schemacrawler.tools.databaseconnector.DatabaseConnector;
3634
import schemacrawler.tools.executable.commandline.PluginCommand;
3735

38-
public final class SAPIQDatabaseConnector
39-
extends DatabaseConnector
40-
{
41-
42-
public SAPIQDatabaseConnector()
43-
throws IOException
44-
{
45-
super(new DatabaseServerType("sapiq", "SAP IQ"),
46-
url -> true,
47-
(informationSchemaViewsBuilder, connection) -> informationSchemaViewsBuilder.fromResourceFolder(
48-
"/sapiq.information_schema"),
49-
(schemaRetrievalOptionsBuilder, connection) -> {},
50-
(limitOptionsBuilder) -> {},
51-
() -> DatabaseConnectionUrlBuilder.builder(
52-
"jdbc:sybase:Tds:${host}:${port}")
53-
.withDefaultPort(50000));
36+
public final class SAPIQDatabaseConnector extends DatabaseConnector {
37+
38+
public SAPIQDatabaseConnector() {
39+
super(
40+
new DatabaseServerType("sapiq", "SAP IQ"),
41+
url -> true,
42+
(informationSchemaViewsBuilder, connection) ->
43+
informationSchemaViewsBuilder.fromResourceFolder("/sapiq.information_schema"),
44+
(schemaRetrievalOptionsBuilder, connection) -> {},
45+
limitOptionsBuilder -> {},
46+
() ->
47+
DatabaseConnectionUrlBuilder.builder("jdbc:sybase:Tds:${host}:${port}")
48+
.withDefaultPort(50000));
5449
}
5550

5651
@Override
57-
public PluginCommand getHelpCommand()
58-
{
52+
public PluginCommand getHelpCommand() {
5953
final PluginCommand pluginCommand = super.getHelpCommand();
6054
pluginCommand
61-
.addOption("server",
62-
String.class,
63-
"--server=sqpiq%n" + "Loads SchemaCrawler plug-in for SAP IQ")
64-
.addOption("host",
65-
String.class,
66-
"Host name%n" + "Optional, defaults to localhost")
67-
.addOption("port",
68-
Integer.class,
69-
"Port number%n" + "Optional, defaults to 50000")
70-
.addOption("database", String.class, "Database name");
55+
.addOption(
56+
"server", String.class, "--server=sqpiq%n" + "Loads SchemaCrawler plug-in for SAP IQ")
57+
.addOption("host", String.class, "Host name%n" + "Optional, defaults to localhost")
58+
.addOption("port", Integer.class, "Port number%n" + "Optional, defaults to 50000")
59+
.addOption("database", String.class, "Database name");
7160
return pluginCommand;
7261
}
73-
7462
}

‎schemacrawler-sapiq/src/main/java/schemacrawler/server/sapiq/SAPIQOdbcDatabaseConnector.java‎

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,47 +28,36 @@
2828

2929
package schemacrawler.server.sapiq;
3030

31-
32-
import java.io.IOException;
3331
import schemacrawler.schemacrawler.DatabaseServerType;
3432
import schemacrawler.tools.databaseconnector.DatabaseConnectionUrlBuilder;
3533
import schemacrawler.tools.databaseconnector.DatabaseConnector;
3634
import schemacrawler.tools.executable.commandline.PluginCommand;
3735

38-
public final class SAPIQOdbcDatabaseConnector
39-
extends DatabaseConnector
40-
{
41-
42-
public SAPIQOdbcDatabaseConnector()
43-
throws IOException
44-
{
45-
super(new DatabaseServerType("sapiq", "SAP IQ"),
46-
url -> true,
47-
(informationSchemaViewsBuilder, connection) -> informationSchemaViewsBuilder.fromResourceFolder(
48-
"/sapiqodbc.information_schema"),
49-
(schemaRetrievalOptionsBuilder, connection) -> schemaRetrievalOptionsBuilder.withDoesNotSupportCatalogs(),
50-
(limitOptionsBuilder) -> {},
51-
() -> DatabaseConnectionUrlBuilder.builder(
52-
"jdbc:sybase:Tds:${host}:${port}")
53-
.withDefaultPort(50000));
36+
public final class SAPIQOdbcDatabaseConnector extends DatabaseConnector {
37+
38+
public SAPIQOdbcDatabaseConnector() {
39+
super(
40+
new DatabaseServerType("sapiq", "SAP IQ"),
41+
url -> true,
42+
(informationSchemaViewsBuilder, connection) ->
43+
informationSchemaViewsBuilder.fromResourceFolder("/sapiqodbc.information_schema"),
44+
(schemaRetrievalOptionsBuilder, connection) ->
45+
schemaRetrievalOptionsBuilder.withDoesNotSupportCatalogs(),
46+
limitOptionsBuilder -> {},
47+
() ->
48+
DatabaseConnectionUrlBuilder.builder("jdbc:sybase:Tds:${host}:${port}")
49+
.withDefaultPort(50000));
5450
}
5551

5652
@Override
57-
public PluginCommand getHelpCommand()
58-
{
53+
public PluginCommand getHelpCommand() {
5954
final PluginCommand pluginCommand = super.getHelpCommand();
6055
pluginCommand
61-
.addOption("server",
62-
String.class,
63-
"--server=sqpiq%n" + "Loads SchemaCrawler plug-in for SAP IQ")
64-
.addOption("host",
65-
String.class,
66-
"Host name%n" + "Optional, defaults to localhost")
67-
.addOption("port",
68-
Integer.class,
69-
"Port number%n" + "Optional, defaults to 50000")
70-
.addOption("database", String.class, "Database name");
56+
.addOption(
57+
"server", String.class, "--server=sqpiq%n" + "Loads SchemaCrawler plug-in for SAP IQ")
58+
.addOption("host", String.class, "Host name%n" + "Optional, defaults to localhost")
59+
.addOption("port", Integer.class, "Port number%n" + "Optional, defaults to 50000")
60+
.addOption("database", String.class, "Database name");
7161
return pluginCommand;
7262
}
73-
7463
}

‎schemacrawler-sapiq/src/test/java/schemacrawler/integration/test/TestSAPIQDistribution.java‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,41 +28,36 @@
2828

2929
package schemacrawler.integration.test;
3030

31-
3231
import static org.hamcrest.MatcherAssert.assertThat;
3332
import static org.hamcrest.Matchers.is;
3433

3534
import java.sql.Connection;
3635

3736
import org.junit.jupiter.api.BeforeEach;
3837
import org.junit.jupiter.api.Test;
39-
import schemacrawler.schemacrawler.SchemaCrawlerException;
38+
4039
import schemacrawler.tools.databaseconnector.DatabaseConnector;
4140
import schemacrawler.tools.databaseconnector.DatabaseConnectorRegistry;
4241

43-
public class TestSAPIQDistribution
44-
{
42+
public class TestSAPIQDistribution {
4543

4644
private DatabaseConnector dbConnector;
4745

4846
@BeforeEach
49-
public void setup()
50-
throws SchemaCrawlerException
51-
{
47+
public void setup() {
5248
final DatabaseConnectorRegistry registry =
53-
DatabaseConnectorRegistry.getDatabaseConnectorRegistry();
49+
DatabaseConnectorRegistry.getDatabaseConnectorRegistry();
5450
dbConnector = registry.findDatabaseConnectorFromDatabaseSystemIdentifier("sapiq");
5551
}
5652

5753
@Test
58-
public void testIdentifierQuoteString()
59-
throws Exception
60-
{
54+
public void testIdentifierQuoteString() throws Exception {
6155
final Connection connection = null;
62-
assertThat(dbConnector
63-
.getSchemaRetrievalOptionsBuilder(connection)
64-
.toOptions()
65-
.getIdentifierQuoteString(), is(""));
56+
assertThat(
57+
dbConnector
58+
.getSchemaRetrievalOptionsBuilder(connection)
59+
.toOptions()
60+
.getIdentifierQuoteString(),
61+
is(""));
6662
}
67-
6863
}

‎schemacrawler-timesten/pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>us.fatehi</groupId>
88
<artifactId>schemacrawler-parent</artifactId>
9-
<version>16.15.11</version>
9+
<version>16.16.02</version>
1010
</parent>
1111
<artifactId>schemacrawler-timesten</artifactId>
1212
<packaging>jar</packaging>
@@ -21,6 +21,7 @@
2121
<groupId>us.fatehi</groupId>
2222
<artifactId>schemacrawler-commandline</artifactId>
2323
<version>${project.version}</version>
24+
<scope>test</scope>
2425
</dependency>
2526

2627
<dependency>

0 commit comments

Comments
 (0)