diff --git a/src/main/java/com/databricks/jdbc/api/impl/DatabricksParameterMetaData.java b/src/main/java/com/databricks/jdbc/api/impl/DatabricksParameterMetaData.java index f8cc351e3e..4f8696d317 100644 --- a/src/main/java/com/databricks/jdbc/api/impl/DatabricksParameterMetaData.java +++ b/src/main/java/com/databricks/jdbc/api/impl/DatabricksParameterMetaData.java @@ -6,7 +6,7 @@ import com.databricks.jdbc.common.util.WrapperUtil; import com.databricks.jdbc.log.JdbcLogger; import com.databricks.jdbc.log.JdbcLoggerFactory; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import java.sql.ParameterMetaData; import java.sql.SQLException; import java.util.HashMap; diff --git a/src/main/java/com/databricks/jdbc/api/impl/DatabricksResultSetMetaData.java b/src/main/java/com/databricks/jdbc/api/impl/DatabricksResultSetMetaData.java index 9b82aa99bd..3afc6e383f 100644 --- a/src/main/java/com/databricks/jdbc/api/impl/DatabricksResultSetMetaData.java +++ b/src/main/java/com/databricks/jdbc/api/impl/DatabricksResultSetMetaData.java @@ -20,10 +20,10 @@ import com.databricks.jdbc.log.JdbcLogger; import com.databricks.jdbc.log.JdbcLoggerFactory; import com.databricks.jdbc.model.client.thrift.generated.*; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import com.databricks.jdbc.model.core.ColumnMetadata; import com.databricks.jdbc.model.core.ResultManifest; -import com.databricks.sdk.service.sql.ColumnInfo; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; import com.google.common.collect.ImmutableList; import java.sql.ResultSetMetaData; import java.sql.SQLException; diff --git a/src/main/java/com/databricks/jdbc/api/impl/SqlParameter.java b/src/main/java/com/databricks/jdbc/api/impl/SqlParameter.java index bd2a40b0cf..8cf968ac43 100644 --- a/src/main/java/com/databricks/jdbc/api/impl/SqlParameter.java +++ b/src/main/java/com/databricks/jdbc/api/impl/SqlParameter.java @@ -1,6 +1,6 @@ package com.databricks.jdbc.api.impl; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import javax.annotation.Nullable; import org.immutables.value.Value; diff --git a/src/main/java/com/databricks/jdbc/api/impl/arrow/ArrowResultChunkIterator.java b/src/main/java/com/databricks/jdbc/api/impl/arrow/ArrowResultChunkIterator.java index 7b63d3deda..2523f75413 100644 --- a/src/main/java/com/databricks/jdbc/api/impl/arrow/ArrowResultChunkIterator.java +++ b/src/main/java/com/databricks/jdbc/api/impl/arrow/ArrowResultChunkIterator.java @@ -2,8 +2,8 @@ import com.databricks.jdbc.api.impl.converters.ArrowToJavaObjectConverter; import com.databricks.jdbc.exception.DatabricksSQLException; -import com.databricks.sdk.service.sql.ColumnInfo; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import org.apache.arrow.vector.ValueVector; public class ArrowResultChunkIterator { diff --git a/src/main/java/com/databricks/jdbc/api/impl/arrow/ArrowStreamResult.java b/src/main/java/com/databricks/jdbc/api/impl/arrow/ArrowStreamResult.java index 0684cc4253..f422ebb8c4 100644 --- a/src/main/java/com/databricks/jdbc/api/impl/arrow/ArrowStreamResult.java +++ b/src/main/java/com/databricks/jdbc/api/impl/arrow/ArrowStreamResult.java @@ -16,10 +16,10 @@ import com.databricks.jdbc.model.client.thrift.generated.TColumnDesc; import com.databricks.jdbc.model.client.thrift.generated.TFetchResultsResp; import com.databricks.jdbc.model.client.thrift.generated.TGetResultSetMetadataResp; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import com.databricks.jdbc.model.core.ResultData; import com.databricks.jdbc.model.core.ResultManifest; -import com.databricks.sdk.service.sql.ColumnInfo; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; import com.google.common.annotations.VisibleForTesting; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/databricks/jdbc/api/impl/converters/ArrowToJavaObjectConverter.java b/src/main/java/com/databricks/jdbc/api/impl/converters/ArrowToJavaObjectConverter.java index 53c673ec6d..3934e5308e 100644 --- a/src/main/java/com/databricks/jdbc/api/impl/converters/ArrowToJavaObjectConverter.java +++ b/src/main/java/com/databricks/jdbc/api/impl/converters/ArrowToJavaObjectConverter.java @@ -12,8 +12,8 @@ import com.databricks.jdbc.exception.DatabricksValidationException; import com.databricks.jdbc.log.JdbcLogger; import com.databricks.jdbc.log.JdbcLoggerFactory; -import com.databricks.sdk.service.sql.ColumnInfo; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import java.math.BigDecimal; import java.math.RoundingMode; import java.sql.Date; diff --git a/src/main/java/com/databricks/jdbc/common/util/DatabricksThriftUtil.java b/src/main/java/com/databricks/jdbc/common/util/DatabricksThriftUtil.java index 824009d0f1..e1a5dd185e 100644 --- a/src/main/java/com/databricks/jdbc/common/util/DatabricksThriftUtil.java +++ b/src/main/java/com/databricks/jdbc/common/util/DatabricksThriftUtil.java @@ -13,11 +13,11 @@ import com.databricks.jdbc.log.JdbcLogger; import com.databricks.jdbc.log.JdbcLoggerFactory; import com.databricks.jdbc.model.client.thrift.generated.*; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import com.databricks.jdbc.model.core.ExternalLink; import com.databricks.jdbc.model.core.StatementStatus; import com.databricks.jdbc.model.telemetry.enums.DatabricksDriverErrorCode; -import com.databricks.sdk.service.sql.ColumnInfo; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; import com.databricks.sdk.service.sql.StatementState; import java.nio.ByteBuffer; import java.util.*; diff --git a/src/main/java/com/databricks/jdbc/common/util/DatabricksTypeUtil.java b/src/main/java/com/databricks/jdbc/common/util/DatabricksTypeUtil.java index 27739a8036..755558c8f3 100644 --- a/src/main/java/com/databricks/jdbc/common/util/DatabricksTypeUtil.java +++ b/src/main/java/com/databricks/jdbc/common/util/DatabricksTypeUtil.java @@ -9,7 +9,7 @@ import com.databricks.jdbc.model.client.thrift.generated.TTypeDesc; import com.databricks.jdbc.model.client.thrift.generated.TTypeEntry; import com.databricks.jdbc.model.client.thrift.generated.TTypeId; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import java.math.BigDecimal; import java.sql.Date; import java.sql.SQLException; diff --git a/src/main/java/com/databricks/jdbc/common/util/SQLInterpolator.java b/src/main/java/com/databricks/jdbc/common/util/SQLInterpolator.java index 8f46d962fe..8cba220385 100644 --- a/src/main/java/com/databricks/jdbc/common/util/SQLInterpolator.java +++ b/src/main/java/com/databricks/jdbc/common/util/SQLInterpolator.java @@ -4,7 +4,7 @@ import com.databricks.jdbc.api.impl.ImmutableSqlParameter; import com.databricks.jdbc.exception.DatabricksValidationException; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/com/databricks/jdbc/model/core/ColumnInfo.java b/src/main/java/com/databricks/jdbc/model/core/ColumnInfo.java new file mode 100644 index 0000000000..39e8f8ed80 --- /dev/null +++ b/src/main/java/com/databricks/jdbc/model/core/ColumnInfo.java @@ -0,0 +1,138 @@ +package com.databricks.jdbc.model.core; + +import com.databricks.sdk.support.ToStringer; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Objects; + +/** + * Column info POJO + * + *

TODO: Replace this class with the corresponding SDK implementation once it becomes available + */ +public class ColumnInfo { + @JsonProperty("name") + private String name; + + @JsonProperty("position") + private Long position; + + @JsonProperty("type_interval_type") + private String typeIntervalType; + + @JsonProperty("type_name") + private ColumnInfoTypeName typeName; + + @JsonProperty("type_precision") + private Long typePrecision; + + @JsonProperty("type_scale") + private Long typeScale; + + @JsonProperty("type_text") + private String typeText; + + public ColumnInfo setName(String name) { + this.name = name; + return this; + } + + public String getName() { + return this.name; + } + + public ColumnInfo setPosition(Long position) { + this.position = position; + return this; + } + + public Long getPosition() { + return this.position; + } + + public ColumnInfo setTypeIntervalType(String typeIntervalType) { + this.typeIntervalType = typeIntervalType; + return this; + } + + public String getTypeIntervalType() { + return this.typeIntervalType; + } + + public ColumnInfo setTypeName(ColumnInfoTypeName typeName) { + this.typeName = typeName; + return this; + } + + public ColumnInfoTypeName getTypeName() { + return this.typeName; + } + + public ColumnInfo setTypePrecision(Long typePrecision) { + this.typePrecision = typePrecision; + return this; + } + + public Long getTypePrecision() { + return this.typePrecision; + } + + public ColumnInfo setTypeScale(Long typeScale) { + this.typeScale = typeScale; + return this; + } + + public Long getTypeScale() { + return this.typeScale; + } + + public ColumnInfo setTypeText(String typeText) { + this.typeText = typeText; + return this; + } + + public String getTypeText() { + return this.typeText; + } + + public boolean equals(Object o) { + if (this == o) { + return true; + } else if (o != null && this.getClass() == o.getClass()) { + ColumnInfo that = (ColumnInfo) o; + return Objects.equals(this.name, that.name) + && Objects.equals(this.position, that.position) + && Objects.equals(this.typeIntervalType, that.typeIntervalType) + && Objects.equals(this.typeName, that.typeName) + && Objects.equals(this.typePrecision, that.typePrecision) + && Objects.equals(this.typeScale, that.typeScale) + && Objects.equals(this.typeText, that.typeText); + } else { + return false; + } + } + + public int hashCode() { + return Objects.hash( + new Object[] { + this.name, + this.position, + this.typeIntervalType, + this.typeName, + this.typePrecision, + this.typeScale, + this.typeText + }); + } + + public String toString() { + return (new ToStringer(ColumnInfo.class)) + .add("name", this.name) + .add("position", this.position) + .add("typeIntervalType", this.typeIntervalType) + .add("typeName", this.typeName) + .add("typePrecision", this.typePrecision) + .add("typeScale", this.typeScale) + .add("typeText", this.typeText) + .toString(); + } +} diff --git a/src/main/java/com/databricks/jdbc/model/core/ColumnInfoTypeName.java b/src/main/java/com/databricks/jdbc/model/core/ColumnInfoTypeName.java new file mode 100644 index 0000000000..14cef2a9be --- /dev/null +++ b/src/main/java/com/databricks/jdbc/model/core/ColumnInfoTypeName.java @@ -0,0 +1,30 @@ +package com.databricks.jdbc.model.core; + +/** + * Column info type name POJO + * + *

TODO: Replace this class with the corresponding SDK implementation once it becomes available + */ +public enum ColumnInfoTypeName { + ARRAY, + BINARY, + BOOLEAN, + BYTE, + CHAR, + DATE, + DECIMAL, + DOUBLE, + FLOAT, + GEOGRAPHY, + GEOMETRY, + INT, + INTERVAL, + LONG, + MAP, + NULL, + SHORT, + STRING, + STRUCT, + TIMESTAMP, + USER_DEFINED_TYPE; +} diff --git a/src/main/java/com/databricks/jdbc/model/core/ResultManifest.java b/src/main/java/com/databricks/jdbc/model/core/ResultManifest.java index da4c2b5211..4188c41adc 100644 --- a/src/main/java/com/databricks/jdbc/model/core/ResultManifest.java +++ b/src/main/java/com/databricks/jdbc/model/core/ResultManifest.java @@ -3,7 +3,6 @@ import com.databricks.jdbc.common.CompressionCodec; import com.databricks.sdk.service.sql.BaseChunkInfo; import com.databricks.sdk.service.sql.Format; -import com.databricks.sdk.service.sql.ResultSchema; import com.databricks.sdk.support.ToStringer; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Collection; diff --git a/src/main/java/com/databricks/jdbc/model/core/ResultSchema.java b/src/main/java/com/databricks/jdbc/model/core/ResultSchema.java new file mode 100644 index 0000000000..c729bb40bc --- /dev/null +++ b/src/main/java/com/databricks/jdbc/model/core/ResultSchema.java @@ -0,0 +1,60 @@ +package com.databricks.jdbc.model.core; + +import com.databricks.sdk.support.ToStringer; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Collection; +import java.util.Objects; + +/** + * Result schema POJO + * + *

TODO: Replace this class with the corresponding SDK implementation once it becomes available + */ +public class ResultSchema { + @JsonProperty("column_count") + private Long columnCount; + + @JsonProperty("columns") + private Collection columns; + + public ResultSchema setColumnCount(Long columnCount) { + this.columnCount = columnCount; + return this; + } + + public Long getColumnCount() { + return this.columnCount; + } + + public ResultSchema setColumns(Collection columns) { + this.columns = columns; + return this; + } + + public Collection getColumns() { + return this.columns; + } + + public boolean equals(Object o) { + if (this == o) { + return true; + } else if (o != null && this.getClass() == o.getClass()) { + ResultSchema that = (ResultSchema) o; + return Objects.equals(this.columnCount, that.columnCount) + && Objects.equals(this.columns, that.columns); + } else { + return false; + } + } + + public int hashCode() { + return Objects.hash(new Object[] {this.columnCount, this.columns}); + } + + public String toString() { + return (new ToStringer(ResultSchema.class)) + .add("columnCount", this.columnCount) + .add("columns", this.columns) + .toString(); + } +} diff --git a/src/test/java/com/databricks/jdbc/api/impl/DatabricksParameterMetaDataTest.java b/src/test/java/com/databricks/jdbc/api/impl/DatabricksParameterMetaDataTest.java index 747042b3b3..3137066c23 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/DatabricksParameterMetaDataTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/DatabricksParameterMetaDataTest.java @@ -4,7 +4,7 @@ import static java.sql.ParameterMetaData.parameterModeIn; import static org.junit.jupiter.api.Assertions.*; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import java.sql.SQLException; import java.sql.Types; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/com/databricks/jdbc/api/impl/DatabricksResultSetMetaDataTest.java b/src/test/java/com/databricks/jdbc/api/impl/DatabricksResultSetMetaDataTest.java index effe887d77..9ae46f4ef4 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/DatabricksResultSetMetaDataTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/DatabricksResultSetMetaDataTest.java @@ -13,8 +13,10 @@ import com.databricks.jdbc.common.util.DatabricksTypeUtil; import com.databricks.jdbc.dbclient.impl.common.StatementId; import com.databricks.jdbc.model.client.thrift.generated.*; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import com.databricks.jdbc.model.core.ResultManifest; -import com.databricks.sdk.service.sql.*; +import com.databricks.jdbc.model.core.ResultSchema; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Types; diff --git a/src/test/java/com/databricks/jdbc/api/impl/ExecutionResultFactoryTest.java b/src/test/java/com/databricks/jdbc/api/impl/ExecutionResultFactoryTest.java index 25e0aad1f6..c12b8e2c72 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/ExecutionResultFactoryTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/ExecutionResultFactoryTest.java @@ -14,8 +14,8 @@ import com.databricks.jdbc.model.client.thrift.generated.*; import com.databricks.jdbc.model.core.ResultData; import com.databricks.jdbc.model.core.ResultManifest; +import com.databricks.jdbc.model.core.ResultSchema; import com.databricks.sdk.service.sql.Format; -import com.databricks.sdk.service.sql.ResultSchema; import java.sql.SQLException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/com/databricks/jdbc/api/impl/arrow/ArrowResultChunkTest.java b/src/test/java/com/databricks/jdbc/api/impl/arrow/ArrowResultChunkTest.java index 3b1bc81209..9d50b498ab 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/arrow/ArrowResultChunkTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/arrow/ArrowResultChunkTest.java @@ -7,9 +7,9 @@ import com.databricks.jdbc.exception.DatabricksParsingException; import com.databricks.jdbc.exception.DatabricksSQLException; import com.databricks.jdbc.model.client.thrift.generated.TSparkArrowResultLink; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import com.databricks.sdk.service.sql.BaseChunkInfo; -import com.databricks.sdk.service.sql.ColumnInfo; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/src/test/java/com/databricks/jdbc/api/impl/arrow/ArrowStreamResultTest.java b/src/test/java/com/databricks/jdbc/api/impl/arrow/ArrowStreamResultTest.java index b34272cb71..bee6c46dd4 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/arrow/ArrowStreamResultTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/arrow/ArrowStreamResultTest.java @@ -21,13 +21,13 @@ import com.databricks.jdbc.model.client.thrift.generated.TGetResultSetMetadataResp; import com.databricks.jdbc.model.client.thrift.generated.TRowSet; import com.databricks.jdbc.model.client.thrift.generated.TSparkArrowResultLink; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import com.databricks.jdbc.model.core.ExternalLink; import com.databricks.jdbc.model.core.ResultData; import com.databricks.jdbc.model.core.ResultManifest; +import com.databricks.jdbc.model.core.ResultSchema; import com.databricks.sdk.service.sql.BaseChunkInfo; -import com.databricks.sdk.service.sql.ColumnInfo; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; -import com.databricks.sdk.service.sql.ResultSchema; import com.google.common.collect.ImmutableList; import java.io.*; import java.time.Instant; diff --git a/src/test/java/com/databricks/jdbc/api/impl/arrow/InlineChunkProviderTest.java b/src/test/java/com/databricks/jdbc/api/impl/arrow/InlineChunkProviderTest.java index e94db52270..86be512d4d 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/arrow/InlineChunkProviderTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/arrow/InlineChunkProviderTest.java @@ -15,10 +15,10 @@ import com.databricks.jdbc.model.client.thrift.generated.TGetResultSetMetadataResp; import com.databricks.jdbc.model.client.thrift.generated.TRowSet; import com.databricks.jdbc.model.client.thrift.generated.TSparkArrowBatch; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import com.databricks.jdbc.model.core.ResultData; import com.databricks.jdbc.model.core.ResultManifest; -import com.databricks.sdk.service.sql.ColumnInfo; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Collections; diff --git a/src/test/java/com/databricks/jdbc/api/impl/arrow/RemoteChunkProviderTest.java b/src/test/java/com/databricks/jdbc/api/impl/arrow/RemoteChunkProviderTest.java index d22fcfc8af..21cbad1f99 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/arrow/RemoteChunkProviderTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/arrow/RemoteChunkProviderTest.java @@ -10,7 +10,7 @@ import com.databricks.jdbc.dbclient.impl.common.StatementId; import com.databricks.jdbc.model.core.ResultData; import com.databricks.jdbc.model.core.ResultManifest; -import com.databricks.sdk.service.sql.ResultSchema; +import com.databricks.jdbc.model.core.ResultSchema; import java.util.ArrayList; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; diff --git a/src/test/java/com/databricks/jdbc/api/impl/converters/ArrowToJavaObjectConverterTest.java b/src/test/java/com/databricks/jdbc/api/impl/converters/ArrowToJavaObjectConverterTest.java index e46605b16c..277f9c4983 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/converters/ArrowToJavaObjectConverterTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/converters/ArrowToJavaObjectConverterTest.java @@ -9,8 +9,8 @@ import com.databricks.jdbc.api.impl.DatabricksStruct; import com.databricks.jdbc.api.internal.IDatabricksConnectionContext; import com.databricks.jdbc.exception.DatabricksValidationException; -import com.databricks.sdk.service.sql.ColumnInfo; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfo; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import com.fasterxml.jackson.core.JsonProcessingException; import java.math.BigDecimal; import java.sql.Date; diff --git a/src/test/java/com/databricks/jdbc/api/impl/volume/VolumeOperationResultTest.java b/src/test/java/com/databricks/jdbc/api/impl/volume/VolumeOperationResultTest.java index 6599496478..f85abbf90b 100644 --- a/src/test/java/com/databricks/jdbc/api/impl/volume/VolumeOperationResultTest.java +++ b/src/test/java/com/databricks/jdbc/api/impl/volume/VolumeOperationResultTest.java @@ -15,8 +15,8 @@ import com.databricks.jdbc.exception.DatabricksHttpException; import com.databricks.jdbc.exception.DatabricksSQLException; import com.databricks.jdbc.model.core.ResultManifest; +import com.databricks.jdbc.model.core.ResultSchema; import com.databricks.jdbc.model.telemetry.enums.DatabricksDriverErrorCode; -import com.databricks.sdk.service.sql.ResultSchema; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; diff --git a/src/test/java/com/databricks/jdbc/common/util/DatabricksThriftUtilTest.java b/src/test/java/com/databricks/jdbc/common/util/DatabricksThriftUtilTest.java index aaf612a9c8..6554e4cc66 100644 --- a/src/test/java/com/databricks/jdbc/common/util/DatabricksThriftUtilTest.java +++ b/src/test/java/com/databricks/jdbc/common/util/DatabricksThriftUtilTest.java @@ -12,7 +12,7 @@ import com.databricks.jdbc.exception.DatabricksHttpException; import com.databricks.jdbc.exception.DatabricksSQLException; import com.databricks.jdbc.model.client.thrift.generated.*; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import com.databricks.sdk.service.sql.StatementState; import java.nio.ByteBuffer; import java.util.*; diff --git a/src/test/java/com/databricks/jdbc/common/util/DatabricksTypeUtilTest.java b/src/test/java/com/databricks/jdbc/common/util/DatabricksTypeUtilTest.java index 09b89f4dc0..8ce97f22ce 100644 --- a/src/test/java/com/databricks/jdbc/common/util/DatabricksTypeUtilTest.java +++ b/src/test/java/com/databricks/jdbc/common/util/DatabricksTypeUtilTest.java @@ -6,7 +6,7 @@ import com.databricks.jdbc.api.internal.IDatabricksConnectionContext; import com.databricks.jdbc.model.client.thrift.generated.TTypeId; -import com.databricks.sdk.service.sql.ColumnInfoTypeName; +import com.databricks.jdbc.model.core.ColumnInfoTypeName; import java.math.BigDecimal; import java.sql.Date; import java.sql.SQLException; diff --git a/src/test/java/com/databricks/jdbc/dbclient/impl/sqlexec/DatabricksSdkClientTest.java b/src/test/java/com/databricks/jdbc/dbclient/impl/sqlexec/DatabricksSdkClientTest.java index 1c31a2cb7b..99e028028b 100644 --- a/src/test/java/com/databricks/jdbc/dbclient/impl/sqlexec/DatabricksSdkClientTest.java +++ b/src/test/java/com/databricks/jdbc/dbclient/impl/sqlexec/DatabricksSdkClientTest.java @@ -3,9 +3,9 @@ import static com.databricks.jdbc.TestConstants.TEST_STRING; import static com.databricks.jdbc.common.DatabricksJdbcConstants.TEMPORARY_REDIRECT_STATUS_CODE; import static com.databricks.jdbc.dbclient.impl.sqlexec.PathConstants.*; -import static com.databricks.sdk.service.sql.ColumnInfoTypeName.DECIMAL; -import static com.databricks.sdk.service.sql.ColumnInfoTypeName.INT; -import static com.databricks.sdk.service.sql.ColumnInfoTypeName.STRING; +import static com.databricks.jdbc.model.core.ColumnInfoTypeName.DECIMAL; +import static com.databricks.jdbc.model.core.ColumnInfoTypeName.INT; +import static com.databricks.jdbc.model.core.ColumnInfoTypeName.STRING; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.*; @@ -29,6 +29,7 @@ import com.databricks.jdbc.model.core.Disposition; import com.databricks.jdbc.model.core.ResultData; import com.databricks.jdbc.model.core.ResultManifest; +import com.databricks.jdbc.model.core.ResultSchema; import com.databricks.jdbc.model.core.StatementStatus; import com.databricks.sdk.core.ApiClient; import com.databricks.sdk.core.DatabricksError; diff --git a/src/test/java/com/databricks/jdbc/dbclient/impl/thrift/DatabricksThriftServiceClientTest.java b/src/test/java/com/databricks/jdbc/dbclient/impl/thrift/DatabricksThriftServiceClientTest.java index 4fb755bb4e..54c7921be7 100644 --- a/src/test/java/com/databricks/jdbc/dbclient/impl/thrift/DatabricksThriftServiceClientTest.java +++ b/src/test/java/com/databricks/jdbc/dbclient/impl/thrift/DatabricksThriftServiceClientTest.java @@ -7,7 +7,7 @@ import static com.databricks.jdbc.common.MetadataResultConstants.*; import static com.databricks.jdbc.common.util.DatabricksThriftUtil.getNamespace; import static com.databricks.jdbc.dbclient.impl.common.CommandConstants.GET_TABLE_TYPE_STATEMENT_ID; -import static com.databricks.sdk.service.sql.ColumnInfoTypeName.*; +import static com.databricks.jdbc.model.core.ColumnInfoTypeName.*; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq;