Changes to Connection.java, Operation.java and OperationGroup.java

Author: Kuassim

java/AoJ/src/com/oracle/adbaoverjdbc/com/oracle/adbaoverjdbc/Connection.java

@@ -225,14 +225,22 @@ jdk.incubator.sql2.Submission<Object> submit(com.oracle.adbaoverjdbc.Operation<O
  }
  }
 
+ protected <V> V connectionPropertyValue(ConnectionProperty prop) {
+ V value = (V)properties.get(prop);
+ if (value == null) return (V)prop.defaultValue();
+ else return value;
+ }
+ 
 
 
 
  // JDBC operations. These are all blocking
 
  private Void jdbcConnect(com.oracle.adbaoverjdbc.Operation<Void> op) {
  try {
- Properties info = (Properties) ((Properties) properties.get(JdbcConnectionProperties.JDBC_CONNECTION_PROPERTIES)).clone();
+ Properties info = (Properties)properties.get(JdbcConnectionProperties.JDBC_CONNECTION_PROPERTIES);
+ info = (Properties)(info == null ? JdbcConnectionProperties.JDBC_CONNECTION_PROPERTIES.defaultValue() 
+ : info.clone());
  info.setProperty("user", (String) properties.get(AdbaConnectionProperty.USER));
  info.setProperty("password", (String) properties.get(AdbaConnectionProperty.PASSWORD));
  String url = (String) properties.get(AdbaConnectionProperty.URL);

java/AoJ/src/com/oracle/adbaoverjdbc/com/oracle/adbaoverjdbc/Operation.java

@@ -48,24 +48,20 @@ abstract class Operation<T> implements jdk.incubator.sql2.Operation<T> {
  private static final Map<Class, SQLType> CLASS_TO_JDBCTYPE = new HashMap<>(20);
  static {
  try {
- CLASS_TO_JDBCTYPE.put(Boolean.class, JDBCType.BOOLEAN);
  CLASS_TO_JDBCTYPE.put(BigInteger.class, JDBCType.BIGINT);
- CLASS_TO_JDBCTYPE.put(Class.forName("[B"), JDBCType.BINARY);
- CLASS_TO_JDBCTYPE.put(Boolean.class, JDBCType.BIT);
  CLASS_TO_JDBCTYPE.put(Boolean.class, JDBCType.BOOLEAN);
+ CLASS_TO_JDBCTYPE.put(Byte.class, JDBCType.TINYINT);
+ CLASS_TO_JDBCTYPE.put(Class.forName("[B"), JDBCType.VARBINARY);
  CLASS_TO_JDBCTYPE.put(Character.class, JDBCType.CHAR);
- CLASS_TO_JDBCTYPE.put(LocalDate.class, JDBCType.DATE);
  CLASS_TO_JDBCTYPE.put(Double.class, JDBCType.DOUBLE);
  CLASS_TO_JDBCTYPE.put(Float.class, JDBCType.FLOAT);
  CLASS_TO_JDBCTYPE.put(Integer.class, JDBCType.INTEGER);
- CLASS_TO_JDBCTYPE.put(Float.class, JDBCType.REAL);
- CLASS_TO_JDBCTYPE.put(Short.class, JDBCType.SMALLINT);
- CLASS_TO_JDBCTYPE.put(LocalTime.class, JDBCType.TIME);
+ CLASS_TO_JDBCTYPE.put(LocalDate.class, JDBCType.DATE);
  CLASS_TO_JDBCTYPE.put(LocalDateTime.class, JDBCType.TIMESTAMP);
- CLASS_TO_JDBCTYPE.put(OffsetTime.class, JDBCType.TIME_WITH_TIMEZONE);
+ CLASS_TO_JDBCTYPE.put(LocalTime.class, JDBCType.TIME);
  CLASS_TO_JDBCTYPE.put(OffsetDateTime.class, JDBCType.TIMESTAMP_WITH_TIMEZONE);
- CLASS_TO_JDBCTYPE.put(Byte.class, JDBCType.TINYINT);
- CLASS_TO_JDBCTYPE.put(Class.forName("[byte"), JDBCType.VARBINARY);
+ CLASS_TO_JDBCTYPE.put(OffsetTime.class, JDBCType.TIME_WITH_TIMEZONE);
+ CLASS_TO_JDBCTYPE.put(Short.class, JDBCType.SMALLINT);
  CLASS_TO_JDBCTYPE.put(String.class, JDBCType.VARCHAR);
  }
  catch (ClassNotFoundException ex) { /* should never happen */ }
@@ -88,9 +84,9 @@ abstract class Operation<T> implements jdk.incubator.sql2.Operation<T> {
  ADBATYPE_TO_JDBCTYPE.put(AdbaType.FLOAT, JDBCType.FLOAT);
  ADBATYPE_TO_JDBCTYPE.put(AdbaType.INTEGER, JDBCType.INTEGER);
  ADBATYPE_TO_JDBCTYPE.put(AdbaType.JAVA_OBJECT, JDBCType.JAVA_OBJECT);
- ADBATYPE_TO_JDBCTYPE.put(AdbaType.LONGNVARCHAR, JDBCType.LONGNVARCHAR);
- ADBATYPE_TO_JDBCTYPE.put(AdbaType.LONGVARBINARY, JDBCType.LONGVARBINARY);
- ADBATYPE_TO_JDBCTYPE.put(AdbaType.LONGVARCHAR, JDBCType.LONGVARBINARY);
+ ADBATYPE_TO_JDBCTYPE.put(AdbaType.LONG_NVARCHAR, JDBCType.LONGNVARCHAR);
+ ADBATYPE_TO_JDBCTYPE.put(AdbaType.LONG_VARBINARY, JDBCType.LONGVARBINARY);
+ ADBATYPE_TO_JDBCTYPE.put(AdbaType.LONG_VARCHAR, JDBCType.LONGVARBINARY);
  ADBATYPE_TO_JDBCTYPE.put(AdbaType.NCHAR, JDBCType.NCHAR);
  ADBATYPE_TO_JDBCTYPE.put(AdbaType.NCLOB, JDBCType.NCLOB);
  ADBATYPE_TO_JDBCTYPE.put(AdbaType.NULL, JDBCType.NULL);

java/AoJ/src/com/oracle/adbaoverjdbc/com/oracle/adbaoverjdbc/OperationGroup.java

@@ -16,13 +16,11 @@
 package com.oracle.adbaoverjdbc;
 
 import jdk.incubator.sql2.ArrayCountOperation;
-import jdk.incubator.sql2.DynamicMultiOperation;
 import jdk.incubator.sql2.LocalOperation;
 import jdk.incubator.sql2.OutOperation;
 import jdk.incubator.sql2.ParameterizedCountOperation;
 import jdk.incubator.sql2.ParameterizedRowOperation;
 import jdk.incubator.sql2.RowProcessorOperation;
-import jdk.incubator.sql2.StaticMultiOperation;
 import jdk.incubator.sql2.Submission;
 import jdk.incubator.sql2.Transaction;
 import jdk.incubator.sql2.TransactionOutcome;
@@ -34,6 +32,7 @@
 import java.util.function.Consumer;
 import java.util.logging.Logger;
 import java.util.stream.Collector;
+import jdk.incubator.sql2.MultiOperation;
 
 /**
  * Only sequential, dependent, unconditional supported.
@@ -205,13 +204,7 @@ public <R extends S> RowProcessorOperation<R> rowProcessorOperation(String sql)
  }
 
  @Override
- public <R extends S> StaticMultiOperation<R> staticMultiOperation(String sql) {
- if ( ! isHeld() ) throw new IllegalStateException("TODO");
- throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
- }
-
- @Override
- public <R extends S> DynamicMultiOperation<R> dynamicMultiOperation(String sql) {
+ public <R extends S> MultiOperation<R> multiOperation(String sql) {
  if ( ! isHeld() ) throw new IllegalStateException("TODO");
  throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
  }