* #4: Added a new capability for scalar function INITCAP. (#6)

* #4: Added a new capability for scala function INITCAP.
exasol · Mar 2, 2021 · e6c6e3c · e6c6e3c
1 parent ed0f5c2
commit e6c6e3c
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 23 deletions.
diff --git a/doc/changes/changes_2.0.0.md b/doc/changes/changes_2.0.0.md
@@ -1,17 +1,36 @@
-# Oracle Virtual Schemas 2.0.0, released 2021-??-??
+# Oracle Virtual Schemas 2.0.0, released 2021-03-03
 
-Code name:
+Code name: Removed `SQL_DIALECT` property
 
 ## Summary
 
 The `SQL_DIALECT` property used when executing a `CREATE VIRTUAL SCHEMA` from the Exasol database is obsolete from this version. Please, do not provide this property anymore.
 
 ## Features / Enhancements
 
-* 3: Unified error messages with `error-reporting-java` 
+* #3: Unified error messages with `error-reporting-java`.
+* #4: Added a new capability for scala function INITCAP.
 
-## Plugin Dependencies
+## Dependencies Updates
+
+### Runtime Dependencies
 
-* Added `com.exasol:error-code-crawler-maven-plugin:0.1.1`
 * Updated `com.exasol:error-reporting-java:0.2.0` to `0.2.2`
-* Updated `com.exasol:virtual-schema-common-jdbc:8.0.0` to `9.0.1`
+* Updated `com.exasol:virtual-schema-common-jdbc:8.0.0` to `9.0.1`
+
+### Test Dependencies
+
+* Updated `org.junit.jupiter:junit-jupiter:5.7.0` to `5.7.1`
+* Updated `org.mockito:mockito-junit-jupiter:3.6.28` to `3.8.0`
+* Updated `nl.jqno.equalsverifier:equalsverifier:3.5` to `3.5.5`
+* Updated `com.exasol:exasol-testcontainers:3.3.1` to `3.5.1`
+* Updated `com.exasol:test-db-builder-java:2.0.0` to `3.1.0`
+* Updated `com.exasol:hamcrest-resultset-matcher:1.2.2` to `1.4.0`
+* Updated `org.testcontainers:junit-jupiter:1.15.0` to `1.15.2`
+* Updated `org.testcontainers:oracle-xe:1.15.0` to `1.15.2`
+
+### Plugin Dependencies
+
+* Added `com.exasol:error-code-crawler-maven-plugin:0.1.1`
+* Updated `org.codehaus.mojo:versions-maven-plugin:2.7` to `2.8.1`
+* Updated `org.jacoco:jacoco-maven-plugin:0.8.5` to `0.8.6`
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 		<vscjdbc.version>9.0.1</vscjdbc.version>
 		<error.reporting.java.version>0.2.2</error.reporting.java.version>
 		<error.code.crawler.version>0.1.1</error.code.crawler.version>
-		<org.testcontainers.version>1.15.0</org.testcontainers.version>
+		<org.testcontainers.version>1.15.2</org.testcontainers.version>
 		<sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml,target/site/jacoco-it/jacoco.xml
 		</sonar.coverage.jacoco.xmlReportPaths>
 	</properties>
@@ -75,26 +75,26 @@
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>5.7.0</version>
+			<version>5.7.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-junit-jupiter</artifactId>
-			<version>3.6.28</version>
+			<version>3.8.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.5</version>
+            <version>3.5.5</version>
             <scope>test</scope>
         </dependency>
 		<!--Integration test dependencies -->
 		<dependency>
 			<groupId>com.exasol</groupId>
 			<artifactId>exasol-testcontainers</artifactId>
-			<version>3.3.1</version>
+			<version>3.5.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -118,13 +118,13 @@
 		<dependency>
 			<groupId>com.exasol</groupId>
 			<artifactId>test-db-builder-java</artifactId>
-			<version>2.0.0</version>
+			<version>3.1.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.exasol</groupId>
 			<artifactId>hamcrest-resultset-matcher</artifactId>
-			<version>1.2.2</version>
+			<version>1.4.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -133,7 +133,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.5</version>
+				<version>0.8.6</version>
 				<executions>
 					<execution>
 						<id>prepare-agent</id>
@@ -247,7 +247,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>versions-maven-plugin</artifactId>
-				<version>2.7</version>
+				<version>2.8.1</version>
 				<executions>
 					<execution>
 						<phase>package</phase>

diff --git a/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java b/src/main/java/com/exasol/adapter/dialects/oracle/OracleSqlDialect.java
@@ -54,7 +54,7 @@ private static Capabilities createCapabilityList() {
                         ADD_DAYS, ADD_HOURS, ADD_MINUTES, ADD_MONTHS, ADD_SECONDS, ADD_WEEKS, ADD_YEARS, CURRENT_DATE,
                         CURRENT_TIMESTAMP, DBTIMEZONE, LOCALTIMESTAMP, NUMTODSINTERVAL, NUMTOYMINTERVAL,
                         SESSIONTIMEZONE, SYSDATE, SYSTIMESTAMP, CAST, TO_CHAR, TO_DATE, TO_DSINTERVAL, TO_YMINTERVAL,
-                        TO_NUMBER, TO_TIMESTAMP, BIT_AND, BIT_TO_NUM, CASE, NULLIFZERO, ZEROIFNULL)
+                        TO_NUMBER, TO_TIMESTAMP, BIT_AND, BIT_TO_NUM, CASE, NULLIFZERO, ZEROIFNULL, INITCAP)
                 .build();
     }
 
@@ -98,7 +98,7 @@ public StructureElementSupport supportsJdbcSchemas() {
 
     DataType getOracleNumberTargetType() {
         if (this.properties.containsKey(ORACLE_CAST_NUMBER_TO_DECIMAL_PROPERTY)) {
-            return getOracleNumberTypeFromProperty();
+            return this.getOracleNumberTypeFromProperty();
         } else {
             return DataType.createMaximumSizeVarChar(DataType.ExaCharset.UTF8);
         }
@@ -173,9 +173,9 @@ protected RemoteMetadataReader createRemoteMetadataReader() {
     @Override
     protected QueryRewriter createQueryRewriter() {
         if (this.isImportFromOraEnabled()) {
-            return new OracleQueryRewriter(this, createRemoteMetadataReader());
+            return new OracleQueryRewriter(this, this.createRemoteMetadataReader());
         }
-        return new ImportIntoTemporaryTableQueryRewriter(this, createRemoteMetadataReader(), this.connectionFactory);
+        return new ImportIntoTemporaryTableQueryRewriter(this, this.createRemoteMetadataReader(), this.connectionFactory);
     }
 
     private boolean isImportFromOraEnabled() {
@@ -185,8 +185,8 @@ private boolean isImportFromOraEnabled() {
     @Override
     public void validateProperties() throws PropertyValidationException {
         super.validateProperties();
-        checkImportPropertyConsistency(ORACLE_IMPORT_PROPERTY, ORACLE_CONNECTION_NAME_PROPERTY);
-        validateBooleanProperty(ORACLE_IMPORT_PROPERTY);
-        validateCastNumberToDecimalProperty(ORACLE_CAST_NUMBER_TO_DECIMAL_PROPERTY);
+        this.checkImportPropertyConsistency(ORACLE_IMPORT_PROPERTY, ORACLE_CONNECTION_NAME_PROPERTY);
+        this.validateBooleanProperty(ORACLE_IMPORT_PROPERTY);
+        this.validateCastNumberToDecimalProperty(ORACLE_CAST_NUMBER_TO_DECIMAL_PROPERTY);
     }
 }
diff --git a/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectTest.java b/src/test/java/com/exasol/adapter/dialects/oracle/OracleSqlDialectTest.java
@@ -80,7 +80,7 @@ void testGetCapabilities() {
                                 ADD_MONTHS, ADD_SECONDS, ADD_WEEKS, ADD_YEARS, CURRENT_DATE, CURRENT_TIMESTAMP,
                                 DBTIMEZONE, LOCALTIMESTAMP, NUMTODSINTERVAL, NUMTOYMINTERVAL, SESSIONTIMEZONE, SYSDATE,
                                 SYSTIMESTAMP, CAST, TO_CHAR, TO_DATE, TO_DSINTERVAL, TO_YMINTERVAL, TO_NUMBER,
-                                TO_TIMESTAMP, BIT_AND, BIT_TO_NUM, CASE, NULLIFZERO, ZEROIFNULL)));
+                                TO_TIMESTAMP, BIT_AND, BIT_TO_NUM, CASE, NULLIFZERO, ZEROIFNULL, INITCAP)));
     }
 
     @Test