Fix rebase problems

Author: alex268

jdbc/src/main/java/tech/ydb/jdbc/common/ColumnInfo.java

@@ -28,12 +28,12 @@ public ColumnInfo(String name, Type type) {
         this.isOptional = desc.isOptional();
         this.ydbType = desc.ydbType();
 
-        this.isTimestamp = type == PrimitiveType.Timestamp;
-        this.isNumber = type == PrimitiveType.Int8 || type == PrimitiveType.Uint8
-                || type == PrimitiveType.Int16 || type == PrimitiveType.Uint16
-                || type == PrimitiveType.Int32 || type == PrimitiveType.Uint32
-                || type == PrimitiveType.Int64 || type == PrimitiveType.Uint64;
-        this.isNull = type.getKind() == Type.Kind.NULL || type.getKind() == Type.Kind.VOID;
+        this.isTimestamp = ydbType == PrimitiveType.Timestamp;
+        this.isNumber = ydbType == PrimitiveType.Int8 || ydbType == PrimitiveType.Uint8
+                || ydbType == PrimitiveType.Int16 || ydbType == PrimitiveType.Uint16
+                || ydbType == PrimitiveType.Int32 || ydbType == PrimitiveType.Uint32
+                || ydbType == PrimitiveType.Int64 || ydbType == PrimitiveType.Uint64;
+        this.isNull = ydbType.getKind() == Type.Kind.NULL || ydbType.getKind() == Type.Kind.VOID;
     }
 
     public String getName() {

jdbc/src/main/java/tech/ydb/jdbc/impl/BaseYdbResultSet.java

@@ -38,6 +38,7 @@
 import tech.ydb.jdbc.YdbStatement;
 import tech.ydb.jdbc.common.ColumnInfo;
 import tech.ydb.table.result.ValueReader;
+import tech.ydb.table.values.Type;
 import tech.ydb.table.values.Value;
 
 /**
@@ -593,8 +594,9 @@ public Value<?> getNativeColumn(int columnIndex) throws SQLException {
         if (wasNull) {
             return null;
         }
-        // It's just a bug in implementation - actualValue could be optional, but without flag
-        // I.e. the optional object looks like empty, not null
+        while (value.getType().getKind() == Type.Kind.OPTIONAL) {
+            value = value.getOptionalItem();
+        }
         return value.getValue();
     }