IGNITE-26314 Use new ResultSet implementation in JdbcDatabaseMetadata.

Author: xtern

modules/jdbc/src/integrationTest/java/org/apache/ignite/internal/jdbc/ItJdbcMetadataSelfTest.java

@@ -36,10 +36,15 @@
 import java.util.List;
 import java.util.StringJoiner;
 import java.util.UUID;
-import org.apache.ignite.internal.jdbc.proto.event.JdbcColumnMeta;
+import org.apache.ignite.internal.jdbc2.JdbcResultSetMetadata;
+import org.apache.ignite.internal.sql.ColumnMetadataImpl;
+import org.apache.ignite.internal.sql.ColumnMetadataImpl.ColumnOriginImpl;
+import org.apache.ignite.internal.sql.ResultSetMetadataImpl;
 import org.apache.ignite.internal.sql.engine.util.SqlTestUtils;
 import org.apache.ignite.internal.type.NativeType;
 import org.apache.ignite.jdbc.AbstractJdbcSelfTest;
+import org.apache.ignite.sql.ColumnMetadata;
+import org.apache.ignite.sql.ColumnMetadata.ColumnOrigin;
 import org.apache.ignite.sql.ColumnType;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Disabled;
@@ -77,24 +82,27 @@ public void testDatabaseMetaDataColumns() throws Exception {
         try {
             DatabaseMetaData dbMeta = conn.getMetaData();
 
-            List<JdbcColumnMeta> columnsMeta = new ArrayList<>();
+            List<ColumnMetadata> columnsMeta = new ArrayList<>();
             try (ResultSet rs = dbMeta.getColumns(null, "META", "TEST", null)) {
                 while (rs.next()) {
-                    JdbcColumnMeta meta = new JdbcColumnMeta(
-                            rs.getString("COLUMN_NAME"),
+                    ColumnOrigin origin = new ColumnOriginImpl(
                             rs.getString("TABLE_SCHEM"),
                             rs.getString("TABLE_NAME"),
+                            rs.getString("COLUMN_NAME")
+                    );
+                    ColumnMetadata meta = new ColumnMetadataImpl(
                             rs.getString("COLUMN_NAME"),
                             dataTypeToColumnType(rs.getInt("DATA_TYPE"), rs.getString("TYPE_NAME")),
-                            rs.getShort("COLUMN_SIZE"),
-                            rs.getShort("DECIMAL_DIGITS"),
-                            "YES".equals(rs.getString("IS_NULLABLE"))
+                            rs.getInt("COLUMN_SIZE"),
+                            rs.getInt("DECIMAL_DIGITS"),
+                            "YES".equals(rs.getString("IS_NULLABLE")),
+                            origin
                     );
                     columnsMeta.add(meta);
                 }
             }
 
-            ResultSetMetaData rsMeta = new JdbcResultSetMetadata(columnsMeta);
+            ResultSetMetaData rsMeta = new JdbcResultSetMetadata(new ResultSetMetadataImpl(columnsMeta));
             checkMeta(rsMeta);
         } finally {
             stmt.execute("DROP TABLE META.TEST;");
@@ -161,7 +169,6 @@ private ColumnType dataTypeToColumnType(int dataType, String typeName) {
     }
 
     @Test
-    @Disabled("https://issues.apache.org/jira/browse/IGNITE-26145")
     public void testResultSetMetaDataColumns() throws Exception {
         createMetaTable();