@@ -175,6 +175,21 @@ public class Database { } /** + * Return the index names for indexes in the given table. + * + * <p>If you have more than one + * schema, only tables in the current + * schema (as set by SET SCHEMA) are consulted.</p> + * + * <p>If a future version of Mayfly implements this functionality in + * java.sql.DatabaseMetaData, this method is likely to remain, as + * being more convenient than DatabaseMetaData.</p> + */ + public List<String> indexes(String tableName) { + return defaultConnection.indexes(tableName); + } + + /** * Number of rows in given table. * * This is a convenience method. Your production code will almost src/net/sourceforge/mayfly/Database.java @@ -106,6 +106,11 @@ public class MayflyConnection { TableData tableData = database.dataStore().table(currentSchema, tableName); return tableData.rowCount(); } + + public List<String> indexes(String tableName) { + TableData tableData = database.dataStore().table(currentSchema, tableName); + return tableData.indexes.names(); + } public void setAutoCommit(boolean autoCommit) throws SQLException { this.autoCommit = autoCommit; src/net/sourceforge/mayfly/MayflyConnection.java @@ -13,7 +13,7 @@ import java.util.Set; public class Indexes implements Iterable<Index> { - private final ImmutableList<Index> indexes; + public final ImmutableList<Index> indexes; public Indexes() { this(new ImmutableList<Index>()); @@ -88,5 +88,13 @@ public class Indexes implements Iterable<Index> { } return false; } + + public List<String> names() { + List<String> result = new ArrayList<String>(); + for (Index index : indexes) { + result.add(index.name()); + } + return result; + } } src/net/sourceforge/mayfly/datastore/Indexes.java @@ -10,6 +10,7 @@ import java.io.Reader; import java.io.StringReader; import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -86,6 +87,29 @@ public class DatabaseTest extends TestCase { } } + public void testIndexesOnNonexistentTable() throws Exception { + try { + database.indexes("nosuch"); + fail(); + } + catch (MayflyException e) { + assertEquals("no table nosuch", e.getMessage()); + } + } + + public void testNoIndexes() throws Exception { + database.execute("create table foo(x integer)"); + assertEquals(0, database.indexes("foo").size()); + } + + public void testReturnIndexes() throws Exception { + database.execute("create table foo(x integer)"); + database.execute("create index an_index_name on foo(x)"); + List<String> indexes = database.indexes("foo"); + assertEquals(1, indexes.size()); + assertEquals("an_index_name", indexes.get(0)); + } + public void testQueryAndSchema() throws Exception { database.execute("create table inAnonymousSchema (x integer)"); database.execute("create schema mars authorization dba create table foo (y integer)"); test/net/sourceforge/mayfly/DatabaseTest.java 6eab092ccedee44519411c6da4ce1d4d284624a5 Jim Kingdon kingdon@panix.com http://github.com/jkingdon/mayfly/commit/de11b332c2ba6990e66a1616bdf1bc8ea56f4404 de11b332c2ba6990e66a1616bdf1bc8ea56f4404 2009-08-26T15:38:03-07:00 2009-08-26T15:38:03-07:00 Add method to list the indexes for a table. c69a7db0aa6c7e03f66eb90bdaa7fb661a930773 Jim Kingdon kingdon@panix.com