Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/exp In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22539/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/exp Modified Files: NetezzaSequenceParentExtractorImpl.java Added Files: NetezzaSynonymParentExpander.java NetezzaSynonymInodeExpanderFactory.java Log Message: Added source tab for synonyms and stored procedures. Can now properly tokenize scripts that contain stored proc statements with the plugin. --- NEW FILE: NetezzaSynonymInodeExpanderFactory.java --- /* * Copyright (C) 2009 Rob Manning * man...@us... * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package net.sourceforge.squirrel_sql.plugins.netezza.exp; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpander; import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpanderFactory; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; /** * Implementation of INodeExpanderFactory for Netezza synonyms * */ public class NetezzaSynonymInodeExpanderFactory implements INodeExpanderFactory { /** * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpanderFactory#createExpander(net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType) */ public INodeExpander createExpander(DatabaseObjectType type) { return new NetezzaSynonymParentExpander(); } /** * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpanderFactory#getParentLabelForType(net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType) */ public String getParentLabelForType(DatabaseObjectType type) { return "SYNONYM"; } } --- NEW FILE: NetezzaSynonymParentExpander.java --- package net.sourceforge.squirrel_sql.plugins.netezza.exp; /* * Copyright (C) 2009 Rob Manning * man...@us... * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; 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; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType; import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo; import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection; import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData; import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities; import net.sourceforge.squirrel_sql.fw.util.log.ILogger; import net.sourceforge.squirrel_sql.fw.util.log.LoggerController; /** * This class handles the expanding of the "Synonym Group" node. It will give a list of all the Sequences * available in the schema. */ public class NetezzaSynonymParentExpander implements INodeExpander { /** * Logger for this class. */ private final static ILogger s_log = LoggerController.createLogger(NetezzaSynonymParentExpander.class); /** SQL used to load sequence names */ private static final String SQL = "SELECT " + "SYNONYM_NAME " + "FROM _v_synonym " + "where synonym_name like ? " + "and refschema = ? " + "and refdatabase = ? "; /** * Default ctor. */ public NetezzaSynonymParentExpander() { super(); } /** * Create the child nodes for the passed parent node and return them. Note that this method should * <B>not</B> actually add the child nodes to the parent node as this is taken care of in the caller. * * @param session * Current session. * @param node * Node to be expanded. * * @return A list of <TT>ObjectTreeNode</TT> objects representing the child nodes for the passed node. */ public List<ObjectTreeNode> createChildren(ISession session, ObjectTreeNode parentNode) throws SQLException { final List<ObjectTreeNode> childNodes = new ArrayList<ObjectTreeNode>(); final IDatabaseObjectInfo parentDbinfo = parentNode.getDatabaseObjectInfo(); final ISQLConnection conn = session.getSQLConnection(); final SQLDatabaseMetaData md = session.getSQLConnection().getSQLMetaData(); final String catalogName = parentDbinfo.getCatalogName(); final String schemaName = parentDbinfo.getSchemaName(); final ObjFilterMatcher filterMatcher = new ObjFilterMatcher(session.getProperties()); PreparedStatement pstmt = null; ResultSet rs = null; try { if (s_log.isDebugEnabled()) { s_log.debug("createChildren: running SQL - "+SQL); s_log.debug("createChildren: with SYNONYM_NAME = "+filterMatcher.getSqlLikeMatchString()); s_log.debug("createChildren: with schema = "+schemaName); s_log.debug("createChildren: with catalog = "+catalogName); } pstmt = conn.prepareStatement(SQL); pstmt.setString(1, filterMatcher.getSqlLikeMatchString()); pstmt.setString(2, schemaName); pstmt.setString(3, catalogName); rs = pstmt.executeQuery(); while (rs.next()) { IDatabaseObjectInfo si = new DatabaseObjectInfo( catalogName, schemaName, rs.getString(1), DatabaseObjectType.SYNONYM, md); if (filterMatcher.matches(si.getSimpleName())) { childNodes.add(new ObjectTreeNode(session, si)); } } } finally { SQLUtilities.closeResultSet(rs, true); } return childNodes; } } Index: NetezzaSequenceParentExtractorImpl.java =================================================================== RCS file: /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/exp/NetezzaSequenceParentExtractorImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NetezzaSequenceParentExtractorImpl.java 25 Dec 2009 03:02:36 -0000 1.1 --- NetezzaSequenceParentExtractorImpl.java 28 Dec 2009 23:43:01 -0000 1.2 *************** *** 32,42 **** private final static ILogger s_log = LoggerController.createLogger(NetezzaSequenceParentExtractorImpl.class); ! ! private static final String SQL = ! "SELECT SEQNAME " + ! "FROM _v_sequence " + ! "WHERE OWNER = ? " + ! "and SEQNAME like ? "; ! @Override public String getSequenceParentQuery() --- 32,43 ---- private final static ILogger s_log = LoggerController.createLogger(NetezzaSequenceParentExtractorImpl.class); ! ! private static final String SQL = ! "SELECT OBJNAME FROM _v_objs_owned " + ! "where CLASS = 'SEQUENCE' " + ! "and DATABASE = ? " + ! "and OWNER = ? " + ! "and OBJNAME like ? "; ! @Override public String getSequenceParentQuery() *************** *** 49,58 **** ObjFilterMatcher filterMatcher) throws SQLException { ! if (s_log.isDebugEnabled()) { ! s_log.debug("bindParameters: :1 = " + parentDbinfo.getSchemaName() + " :2 = " ! + filterMatcher.getSqlLikeMatchString()); } ! pstmt.setString(1, parentDbinfo.getSchemaName()); ! pstmt.setString(2, filterMatcher.getSqlLikeMatchString()); } --- 50,62 ---- ObjFilterMatcher filterMatcher) throws SQLException { ! if (s_log.isDebugEnabled()) ! { ! s_log.debug("bindParameters: database = " + parentDbinfo.getCatalogName()); ! s_log.debug("bindParameters: owner = " + parentDbinfo.getSchemaName()); ! s_log.debug("bindParameters: objname = " + filterMatcher.getSqlLikeMatchString()); } ! pstmt.setString(1, parentDbinfo.getCatalogName()); ! pstmt.setString(2, parentDbinfo.getSchemaName()); ! pstmt.setString(3, filterMatcher.getSqlLikeMatchString()); } |
