From f1cd5853aea7e25c20fba758e23d6bb7832ec318 Mon Sep 17 00:00:00 2001 From: Hammer Date: Thu, 16 Jul 2026 11:59:59 -0400 Subject: [PATCH] Fix bugs with mysql casing and update version to 1.13 --- pom.xml | 2 +- src/main/java/com/samskivert/jdbc/BaseLiaison.java | 6 +++--- src/main/java/com/samskivert/jdbc/JDBCUtil.java | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index f62325b1..1c647ca2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.samskivert samskivert jar - 1.12-SNAPSHOT + 1.13 samskivert A collection of Java utilities. diff --git a/src/main/java/com/samskivert/jdbc/BaseLiaison.java b/src/main/java/com/samskivert/jdbc/BaseLiaison.java index d1630465..6f4bb413 100644 --- a/src/main/java/com/samskivert/jdbc/BaseLiaison.java +++ b/src/main/java/com/samskivert/jdbc/BaseLiaison.java @@ -72,7 +72,7 @@ public abstract class BaseLiaison implements DatabaseLiaison ResultSet rs = conn.getMetaData().getTables(null, null, name, null); while (rs.next()) { String tname = rs.getString("TABLE_NAME"); - if (name.equals(tname)) { + if (name.equalsIgnoreCase(tname)) { return true; } } @@ -87,7 +87,7 @@ public abstract class BaseLiaison implements DatabaseLiaison while (rs.next()) { String tname = rs.getString("TABLE_NAME"); String cname = rs.getString("COLUMN_NAME"); - if (tname.equals(table) && cname.equals(column)) { + if (tname.equalsIgnoreCase(table) && cname.equalsIgnoreCase(column)) { return true; } } @@ -102,7 +102,7 @@ public abstract class BaseLiaison implements DatabaseLiaison while (rs.next()) { String tname = rs.getString("TABLE_NAME"); String iname = rs.getString("INDEX_NAME"); - if (tname.equals(table) && index.equals(iname)) { + if (tname.equalsIgnoreCase(table) && index.equalsIgnoreCase(iname)) { return true; } } diff --git a/src/main/java/com/samskivert/jdbc/JDBCUtil.java b/src/main/java/com/samskivert/jdbc/JDBCUtil.java index 9d5c6176..c64612db 100644 --- a/src/main/java/com/samskivert/jdbc/JDBCUtil.java +++ b/src/main/java/com/samskivert/jdbc/JDBCUtil.java @@ -318,7 +318,7 @@ public class JDBCUtil ResultSet rs = conn.getMetaData().getTables(conn.getCatalog(), null, name, null); while (rs.next()) { String tname = rs.getString("TABLE_NAME"); - if (name.equals(tname)) { + if (name.equalsIgnoreCase(tname)) { matched = true; } } @@ -338,7 +338,7 @@ public class JDBCUtil while (rs.next()) { String tname = rs.getString("TABLE_NAME"); String cname = rs.getString("COLUMN_NAME"); - if (tname.equals(table) && cname.equals(column)) { + if (tname.equalsIgnoreCase(table) && cname.equalsIgnoreCase(column)) { matched = true; } } @@ -362,10 +362,10 @@ public class JDBCUtil String cname = rs.getString("COLUMN_NAME"); String iname = rs.getString("INDEX_NAME"); if (index == null) { - if (tname.equals(table) && cname.equals(column)) { + if (tname.equalsIgnoreCase(table) && cname.equalsIgnoreCase(column)) { matched = true; } - } else if (index.equals(iname)) { + } else if (index.equalsIgnoreCase(iname)) { matched = true; } } @@ -383,7 +383,7 @@ public class JDBCUtil while (rs.next()) { String tname = rs.getString("TABLE_NAME"); String cname = rs.getString("COLUMN_NAME"); - if (tname.equals(table) && cname.equals(column)) { + if (tname.equalsIgnoreCase(table) && cname.equalsIgnoreCase(column)) { matched = true; } } @@ -402,7 +402,7 @@ public class JDBCUtil String tname = rs.getString("TABLE_NAME"); String cname = rs.getString("COLUMN_NAME"); String iname = rs.getString("INDEX_NAME"); - if (tname.equals(table) && cname.equals(column)) { + if (tname.equalsIgnoreCase(table) && cname.equalsIgnoreCase(column)) { return iname; } } @@ -635,7 +635,7 @@ public class JDBCUtil while (rs.next()) { String tname = rs.getString("TABLE_NAME"); String cname = rs.getString("COLUMN_NAME"); - if (tname.equals(table) && cname.equals(column)) { + if (tname.equalsIgnoreCase(table) && cname.equalsIgnoreCase(column)) { return rs; } }