Workaround case issue in file name

speedment · Mar 31, 2016 · 5d2334e · 5d2334e
1 parent 19d2f15
commit 5d2334e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/...speedment/db/metadata/ColumnMetadata.java → ...peedment/db/metadata/ColumnMetaData2.java b/...speedment/db/metadata/ColumnMetadata.java → ...peedment/db/metadata/ColumnMetaData2.java
@@ -16,14 +16,14 @@
  */
 package com.speedment.db.metadata;
 
-import com.speedment.internal.core.db.metadata.ColumnMetaDataImpl;
+import com.speedment.internal.core.db.metadata.ColumnMetaDataImpl2;
 import java.sql.ResultSet;
 
 /**
  *
  * @author Per Minborg
  */
-public interface ColumnMetaData {
+public interface ColumnMetaData2 {
 
     /**
      * Returns the table catalog (may be null).
@@ -311,8 +311,8 @@ public interface ColumnMetaData {
      * @param rs with column metadata
      * @return a new ColumnMetadata from the given {@link ResultSet}
      */
-    static ColumnMetaData of(ResultSet rs) {
+    static ColumnMetaData2 of(ResultSet rs) {
-        return new ColumnMetaDataImpl(rs);
+        return new ColumnMetaDataImpl2(rs);
     }
 
 

diff --git a/src/main/java/com/speedment/internal/core/db/AbstractRelationalDbmsHandler.java b/src/main/java/com/speedment/internal/core/db/AbstractRelationalDbmsHandler.java
@@ -71,7 +71,6 @@
 import com.speedment.internal.util.document.DocumentUtil;
 import java.util.concurrent.CompletableFuture;
 import static java.util.Collections.singletonList;
-import com.speedment.db.metadata.ColumnMetaData;
 import com.speedment.internal.core.runtime.typemapping.StandardJavaTypeMapping;
 import java.math.BigDecimal;
 import java.sql.Blob;
@@ -84,6 +83,10 @@
 import static com.speedment.internal.core.stream.OptionalUtil.unwrap;
 import static com.speedment.util.NullUtil.requireNonNulls;
 import static java.util.Objects.requireNonNull;
+import com.speedment.db.metadata.ColumnMetaData2;
+import static com.speedment.internal.core.stream.OptionalUtil.unwrap;
+import static com.speedment.util.NullUtil.requireNonNulls;
+import static java.util.Objects.requireNonNull;
 
 /**
  *
@@ -342,7 +345,7 @@ protected void columns(Connection connection, Map<String, Class<?>> sqlTypeMappi
 
         final TableChildMutator<Column, ResultSet> mutator = (column, rs) -> {
 
-            final ColumnMetaData md = ColumnMetaData.of(rs);
+            final ColumnMetaData2 md = ColumnMetaData2.of(rs);
 
             final String columnName = md.getColumnName();
 
@@ -542,7 +545,7 @@ protected <T> void tableChilds(
      * @param rs that contains column metadata (per
      * connection.getMetaData().getColumns(...))
      */
-    protected void setAutoIncrement(Column column, ColumnMetaData md) throws SQLException {
+    protected void setAutoIncrement(Column column, ColumnMetaData2 md) throws SQLException {
         final String isAutoIncrementString = md.getIsAutoincrement();
 
         if (YES.equalsIgnoreCase(isAutoIncrementString) /* || YES.equalsIgnoreCase(isGeneratedColumnString)*/) {
@@ -559,7 +562,7 @@ protected void setAutoIncrement(Column column, ColumnMetaData md) throws SQLExce
      * @param decimalDigits the DECIMAL_DIGITS value
      * @return the mapped Class
      */
-    protected Class<?> lookupJdbcClass(Map<String, Class<?>> sqlTypeMapping, ColumnMetaData md) {
+    protected Class<?> lookupJdbcClass(Map<String, Class<?>> sqlTypeMapping, ColumnMetaData2 md) {
         requireNonNull(md);
 
         // Firstly, try  md.getTypeName()

diff --git a/src/main/java/com/speedment/internal/core/db/MySqlDbmsHandler.java b/src/main/java/com/speedment/internal/core/db/MySqlDbmsHandler.java
@@ -18,11 +18,11 @@
 
 import com.speedment.Speedment;
 import com.speedment.config.db.Dbms;
-import com.speedment.db.metadata.ColumnMetaData;
 import java.sql.Blob;
 import java.sql.SQLException;
 import java.util.Map;
 import java.util.stream.Stream;
+import com.speedment.db.metadata.ColumnMetaData2;
 
 /**
  * Specific MySQL implementation of a DbmsHandler. Currently, there are no
@@ -53,7 +53,7 @@ protected void addCustomJavaTypeMap() {
     }
 
     @Override
-    protected Class<?> lookupJdbcClass(Map<String, Class<?>> sqlTypeMapping, ColumnMetaData md) {
+    protected Class<?> lookupJdbcClass(Map<String, Class<?>> sqlTypeMapping, ColumnMetaData2 md) {
         if ("BIT".equals(md.getTypeName()) && md.getColumnSize() == 1) {
             // Map a BIT(1) to boolean
             return Boolean.class;

diff --git a/src/main/java/com/speedment/internal/core/db/PostgresDbmsHandler.java b/src/main/java/com/speedment/internal/core/db/PostgresDbmsHandler.java
@@ -19,10 +19,11 @@
 import com.speedment.Speedment;
 import com.speedment.config.db.Column;
 import com.speedment.config.db.Dbms;
-import com.speedment.db.metadata.ColumnMetaData;
 import java.sql.SQLException;
 import java.util.Map;
 import static java.util.Objects.requireNonNull;
+import com.speedment.db.metadata.ColumnMetaData2;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Created by fdirlikl on 11/15/2015.
@@ -34,7 +35,7 @@ public PostgresDbmsHandler(Speedment speedment, final Dbms dbms) {
     }
 
     @Override
-    protected Class<?> lookupJdbcClass(Map<String, Class<?>> sqlTypeMapping, ColumnMetaData md) {
+    protected Class<?> lookupJdbcClass(Map<String, Class<?>> sqlTypeMapping, ColumnMetaData2 md) {
         requireNonNull(sqlTypeMapping);
         requireNonNull(md);
         final String typeName = md.getTypeName().toUpperCase();
@@ -53,7 +54,7 @@ protected Class<?> lookupJdbcClass(Map<String, Class<?>> sqlTypeMapping, ColumnM
     }
 
     @Override
-    protected void setAutoIncrement(Column column, ColumnMetaData md) throws SQLException {
+    protected void setAutoIncrement(Column column, ColumnMetaData2 md) throws SQLException {
         final String defaultValue = md.getColumnDef();
         if (defaultValue != null && defaultValue.startsWith("nextval(")) {
             column.mutator().setAutoIncrement(true);

diff --git a/.../core/db/metadata/ColumnMetadataImpl.java → ...core/db/metadata/ColumnMetaDataImpl2.java b/.../core/db/metadata/ColumnMetadataImpl.java → ...core/db/metadata/ColumnMetaDataImpl2.java
@@ -21,15 +21,15 @@
 import com.speedment.internal.logging.LoggerManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import com.speedment.db.metadata.ColumnMetaData;
+import com.speedment.db.metadata.ColumnMetaData2;
 
 /**
  *
  * @author Per Minborg
  */
-public class ColumnMetaDataImpl implements ColumnMetaData {
+public class ColumnMetaDataImpl2 implements ColumnMetaData2 {
 
-    private final static Logger LOGGER = LoggerManager.getLogger(ColumnMetaDataImpl.class);
+    private final static Logger LOGGER = LoggerManager.getLogger(ColumnMetaDataImpl2.class);
 
     private final String tableCat;
     private final String tableSchem;
@@ -55,7 +55,7 @@ public class ColumnMetaDataImpl implements ColumnMetaData {
     private final String isAutoincrement;
     private final String isGeneratedcolumn;
 
-    public ColumnMetaDataImpl(ResultSet rs) {
+    public ColumnMetaDataImpl2(ResultSet rs) {
         tableCat = readSilent(rs, () -> rs.getString(1));
         tableSchem = readSilent(rs, () -> rs.getString(2));
         tableName = readSilent(rs, () -> rs.getString(3));