Thread: [Squirrel-sql-commits] sql12/plugins/h2/src/net/sourceforge/squirrel_sql/plugins/h2/exp SequencePa
A Java SQL client for any JDBC compliant database
Brought to you by:
colbell,
gerdwagner
From: Gerd W. <ger...@us...> - 2008-09-27 18:20:06
|
Update of /cvsroot/squirrel-sql/sql12/plugins/h2/src/net/sourceforge/squirrel_sql/plugins/h2/exp In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11376/plugins/h2/src/net/sourceforge/squirrel_sql/plugins/h2/exp Modified Files: SequenceParentExpander.java Log Message: Object tree filtering: Multiple (comma separated) Object tree filters can be defined. Filter conditions can be excluding oder including. Better support for placeholders "%" and "_". Index: SequenceParentExpander.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/h2/src/net/sourceforge/squirrel_sql/plugins/h2/exp/SequenceParentExpander.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SequenceParentExpander.java 27 Jul 2007 00:14:29 -0000 1.3 --- SequenceParentExpander.java 27 Sep 2008 18:19:57 -0000 1.4 *************** *** 25,28 **** --- 25,29 ---- import net.sourceforge.squirrel_sql.client.session.ISession; + import net.sourceforge.squirrel_sql.client.session.schemainfo.ObjFilterMatcher; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.ObjectTreeNode; *************** *** 75,79 **** final String catalogName = parentDbinfo.getCatalogName(); final String schemaName = parentDbinfo.getSchemaName(); ! final String objFilter = session.getProperties().getObjectFilter(); --- 76,80 ---- final String catalogName = parentDbinfo.getCatalogName(); final String schemaName = parentDbinfo.getSchemaName(); ! final ObjFilterMatcher filterMatcher = new ObjFilterMatcher(session.getProperties()); *************** *** 83,87 **** { pstmt.setString(1, schemaName); ! pstmt.setString(2, objFilter != null && objFilter.length() > 0 ? objFilter :"%"); rs = pstmt.executeQuery(); while (rs.next()) --- 84,88 ---- { pstmt.setString(1, schemaName); ! pstmt.setString(2, filterMatcher.getSqlLikeMatchString()); rs = pstmt.executeQuery(); while (rs.next()) *************** *** 90,94 **** schemaName, rs.getString(1), DatabaseObjectType.SEQUENCE, md); ! childNodes.add(new ObjectTreeNode(session, si)); } } --- 91,99 ---- schemaName, rs.getString(1), DatabaseObjectType.SEQUENCE, md); ! ! if(filterMatcher.matches(si.getSimpleName())) ! { ! childNodes.add(new ObjectTreeNode(session, si)); ! } } } |