joerg/database
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use column labels

Browse source
This commit is contained in:
Jörg Prante 2023-07-26 15:01:35 +02:00
parent f8d1200314
commit 26bbb56b35
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -1,5 +1,5 @@
group = org.xbib group = org.xbib
name = database name = database
version = 1.1.0 version = 1.2.0
org.gradle.warning.mode = ALL org.gradle.warning.mode = ALL

14
jdbc-oracle/src/test/java/org/xbib/jdbc/oracle/test/OracleTest.java
View file

@ -1,6 +1,7 @@
package org.xbib.jdbc.oracle.test; package org.xbib.jdbc.oracle.test;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
@ -10,6 +11,7 @@ import org.xbib.jdbc.query.Config;
import org.xbib.jdbc.query.ConfigSupplier; import org.xbib.jdbc.query.ConfigSupplier;
import org.xbib.jdbc.query.DatabaseProvider; import org.xbib.jdbc.query.DatabaseProvider;
import org.xbib.jdbc.query.OptionsOverride; import org.xbib.jdbc.query.OptionsOverride;
import org.xbib.jdbc.query.Schema;
import org.xbib.jdbc.test.CommonTest; import org.xbib.jdbc.test.CommonTest;
/** /**
@ -64,4 +66,16 @@ public class OracleTest extends CommonTest {
public void argDoubleNegativeZero() { public void argDoubleNegativeZero() {
super.argDoubleNegativeZero(); super.argDoubleNegativeZero();
} }
@Override
@Test
public void metadataColumnNames() {
db.dropTableQuietly("dbtest");
new Schema().addTable("dbtest").addColumn("pk").primaryKey().schema().execute(db);
db.toSelect("select Pk, Pk as Foo, Pk as \"Foo\" from dbtest")
.query(rs -> {
Assertions.assertArrayEquals(new String[]{"PK", "FOO", "Foo"}, rs.getColumnLabels());
return null;
});
}
} }

6
jdbc-query/src/main/java/org/xbib/jdbc/query/DatabaseImpl.java
View file

@ -338,13 +338,13 @@ public class DatabaseImpl implements Database {
Table table = new Table(); Table table = new Table();
sql.query(rows -> { sql.query(rows -> {
ResultSetMetaData md = rows.getMetadata(); ResultSetMetaData md = rows.getMetadata();
List<Object> columnNames = new ArrayList<>(); List<Object> columnLabels = new ArrayList<>();
List<Object> classNames = new ArrayList<>(); List<Object> classNames = new ArrayList<>();
for (int i = 1; i <= md.getColumnCount(); i++) { for (int i = 1; i <= md.getColumnCount(); i++) {
columnNames.add(md.getColumnName(i).toLowerCase(Locale.ROOT)); columnLabels.add(md.getColumnLabel(i));
classNames.add(md.getColumnClassName(i)); classNames.add(md.getColumnClassName(i));
} }
table.add(columnNames); table.add(columnLabels);
table.add(classNames); table.add(classNames);
int i = 0; int i = 0;
while (rows.next() && (limit <= 0 || i++ < limit)) { while (rows.next() && (limit <= 0 || i++ < limit)) {

2
jdbc-query/src/main/java/org/xbib/jdbc/query/Schema.java
View file

@ -25,7 +25,7 @@ public class Schema {
private final List<Sequence> sequences; private final List<Sequence> sequences;
private boolean indexForeignKeys = true; private boolean indexForeignKeys;
private String userTableName; private String userTableName;