Changes after rebase.

spotify · Mar 12, 2022 · 12989f1 · 12989f1
1 parent 3c87caa
commit 12989f1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/dbeam-core/src/main/java/com/spotify/dbeam/avro/JdbcAvroSchema.java b/dbeam-core/src/main/java/com/spotify/dbeam/avro/JdbcAvroSchema.java
@@ -139,7 +139,9 @@ private static SchemaBuilder.FieldAssembler<Schema> createAvroFields(
               .name(normalizeForAvro(columnName))
               .doc(
                   provider.getFieldDoc(
-                      columnName, String.format("From sqlType %d %s (%s)", columnType, typeName, columnClassName)))
+                      columnName,
+                      String.format(
+                          "From sqlType %d %s (%s)", columnType, typeName, columnClassName)))
               .prop("columnName", columnName)
               .prop("sqlCode", String.valueOf(columnType))
               .prop("typeName", typeName)
@@ -172,7 +174,6 @@ private static SchemaBuilder.FieldAssembler<Schema> createAvroFields(
    *   <li>{@link com.mysql.cj.MysqlType }
    *   <li>{@link org.h2.value.TypeInfo }
    * </ul>
-   *
    */
   private static SchemaBuilder.UnionAccumulator<SchemaBuilder.NullDefault<Schema>>
       setAvroColumnType(

diff --git a/dbeam-core/src/test/java/com/spotify/dbeam/JavaSqlHelper.java b/dbeam-core/src/test/java/com/spotify/dbeam/JavaSqlHelper.java
@@ -53,6 +53,7 @@ public static ResultSetMetaData create(
         when(rsMetaData.getTableName(i + 1)).thenReturn(tableNames[i]);
         when(rsMetaData.getColumnName(i + 1)).thenReturn(columnNames[i]);
         when(rsMetaData.getColumnType(i + 1)).thenReturn(columnTypes[i]);
+        when(rsMetaData.getColumnClassName(i + 1)).thenReturn("dummy");
       }
       return rsMetaData;
     }

diff --git a/dbeam-core/src/test/java/com/spotify/dbeam/avro/JdbcAvroSchemaTest.java b/dbeam-core/src/test/java/com/spotify/dbeam/avro/JdbcAvroSchemaTest.java
@@ -26,7 +26,6 @@
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Types;
-import java.util.Optional;
 import org.apache.avro.Schema;
 import org.junit.Assert;
 import org.junit.Test;
@@ -151,9 +150,15 @@ public void shouldDefaultConversionToStringType() throws SQLException {
 
   private Schema createAvroSchemaForSingleField(
       final ResultSet resultSet, final boolean useLogicalTypes) throws SQLException {
+    final String avroSchemaNamespace = "namespace1";
+    final String connectionUrl = "url1";
+    final String schemaName = null;
+    final String avroDoc = "doc1";
+    AvroSchemaMetadataProvider provider =
+            new AvroSchemaMetadataProvider(avroSchemaNamespace, schemaName, avroDoc);    
     Schema avroSchema =
         JdbcAvroSchema.createAvroSchema(
-            resultSet, "namespace1", "url1", Optional.empty(), "doc1", useLogicalTypes);
+            resultSet, connectionUrl, useLogicalTypes, provider);
 
     return avroSchema.getField("column1").schema().getTypes().get(COLUMN_NUM);
   }