squirrel-sql-commits — A list that broadcasts CVS commit activity

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tab SynonymDetailsTab.java, NONE, 1.1 I18NStrings.properties, NONE, 1.1 SequenceDetailsTab.java, NONE, 1.1 SynonymSourceTab.java, NONE, 1.1 NetezzaProcedureFormator.java, NONE, 1.1 ViewSourceTab.java, 1.1, 1.2 ProcedureSourceTab.java, 1.1, 1.2

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tab
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22539/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tab

Modified Files:
	ViewSourceTab.java ProcedureSourceTab.java 
Added Files:
	SynonymDetailsTab.java I18NStrings.properties 
	SequenceDetailsTab.java SynonymSourceTab.java 
	NetezzaProcedureFormator.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: SequenceDetailsTab.java ---
package net.sourceforge.squirrel_sql.plugins.netezza.tab;
/*
 * 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.SQLException;

import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
/**
 * This class will display the details for an Netezza sequence.
 */
public class SequenceDetailsTab extends BasePreparedStatementTab
{
	private static final StringManager s_stringMgr =
		StringManagerFactory.getStringManager(SequenceDetailsTab.class);

    /** Logger for this class. */
    private final static ILogger s_log =
        LoggerController.createLogger(SequenceDetailsTab.class);
	/**
	 * This interface defines locale specific strings. This should be
	 * replaced with a property file.
	 */
	private interface i18n
	{
		// i18n[SequenceDetailsTab.title=Details]
		String TITLE = s_stringMgr.getString("SequenceDetailsTab.title");
		// i18n[SequenceDetailsTab.hint=Display sequence details]
		String HINT = s_stringMgr.getString("SequenceDetailsTab.hint");
	}

	/** SQL that retrieves the data. */
	private static final String SQL =
        "SELECT SEQUENCE_CATALOG,SEQUENCE_SCHEMA, " +
        "CURRENT_VALUE,INCREMENT,IS_GENERATED,REMARKS " +
        "FROM INFORMATION_SCHEMA.SEQUENCES " +
        "WHERE SEQUENCE_SCHEMA = ? " +
        "AND SEQUENCE_NAME = ? ";
    
	public SequenceDetailsTab()
	{
		super(i18n.TITLE, i18n.HINT, true);
	}

	protected PreparedStatement createStatement() throws SQLException
	{
		ISession session = getSession();
        IDatabaseObjectInfo doi = getDatabaseObjectInfo();

        if (s_log.isDebugEnabled()) {
            s_log.debug("Sequence details SQL: "+SQL);
            s_log.debug("Sequence schema: "+doi.getSchemaName());
            s_log.debug("Sequence name: "+doi.getSimpleName());
        }

		PreparedStatement pstmt = session.getSQLConnection().prepareStatement(SQL);
        pstmt.setString(1, doi.getSchemaName());
        pstmt.setString(2, doi.getSimpleName());
		return pstmt;
	}
    
}

Index: ViewSourceTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tab/ViewSourceTab.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ViewSourceTab.java	25 Dec 2009 03:02:36 -0000	1.1
--- ViewSourceTab.java	28 Dec 2009 23:43:01 -0000	1.2
***************
*** 21,24 ****
--- 21,26 ----
  import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab;
  import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+ import net.sourceforge.squirrel_sql.fw.util.StringManager;
+ import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
  
  /**
***************
*** 27,41 ****
  public class ViewSourceTab extends FormattedSourceTab
  {
  	/**
  	 * Constructor
  	 * 
- 	 * @param hint
- 	 *           what the user sees on mouse-over tool-tip
  	 * @param stmtSep
  	 *           the string to use to separate SQL statements
  	 */
! 	public ViewSourceTab(String hint, String stmtSep)
  	{
! 		super(hint);
  		super.setupFormatter(stmtSep, null);
  		super.setCompressWhitespace(true);
--- 29,50 ----
  public class ViewSourceTab extends FormattedSourceTab
  {
+ 	private static final StringManager s_stringMgr =
+ 		StringManagerFactory.getStringManager(ViewSourceTab.class);
+ 
+ 	public static interface i18n
+ 	{
+ 		// i18n[ViewSourceTab.hint=Shows the source of the selected view]
+ 		String hint = s_stringMgr.getString("ViewSourceTab.hint");
+ 	}
+ 	
  	/**
  	 * Constructor
  	 * 
  	 * @param stmtSep
  	 *           the string to use to separate SQL statements
  	 */
! 	public ViewSourceTab(String stmtSep)
  	{
! 		super(i18n.hint);
  		super.setupFormatter(stmtSep, null);
  		super.setCompressWhitespace(true);

--- NEW FILE: I18NStrings.properties ---

ProcedureSourceTab.hint=Shows the source of the selected procedure

SynonymDetailsTab.hint=Display synonym details
SynonymDetailsTab.title=Details

SynonymSourceTab.hint=Shows the source of the selected synonym

ViewSourceTab.hint=Shows the source of the selected view
--- NEW FILE: SynonymDetailsTab.java ---
package net.sourceforge.squirrel_sql.plugins.netezza.tab;

/*
 * 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.SQLException;

import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;

/**
 * This class will display the details for an Netezza synonym.
 */
public class SynonymDetailsTab extends BasePreparedStatementTab
{
	private static final StringManager s_stringMgr =
		StringManagerFactory.getStringManager(SynonymDetailsTab.class);

	/** Logger for this class. */
	private final static ILogger s_log = LoggerController.createLogger(SynonymDetailsTab.class);

	/**
	 * This interface defines locale specific strings. This should be replaced with a property file.
	 */
	private interface i18n
	{
		// i18n[SynonymDetailsTab.title=Details]
		String TITLE = s_stringMgr.getString("SynonymDetailsTab.title");

		// i18n[SynonymDetailsTab.hint=Display synonym details]
		String HINT = s_stringMgr.getString("SynonymDetailsTab.hint");
	}

	/** SQL that retrieves the data. */
	private static final String SQL =
		"SELECT " +
		"SYNONYM_NAME, " +
		"refobjname as Referenced_Object, " +
		"refdatabase as Referenced_Database , " +
		"refdatabase || '.' || synonym_name as Qualified_Name " +
		"FROM _v_synonym " +
		"where synonym_name = ? " +
		"and refschema = ? ";

		
	public SynonymDetailsTab()
	{
		super(i18n.TITLE, i18n.HINT, true);
	}

	protected PreparedStatement createStatement() throws SQLException
	{
		ISession session = getSession();
		IDatabaseObjectInfo doi = getDatabaseObjectInfo();

		if (s_log.isDebugEnabled())
		{
			s_log.debug("Synonym details SQL: " + SQL);
			s_log.debug("Synonym name: " + doi.getSimpleName());
			s_log.debug("Synonym schema: " + doi.getSchemaName());
		}

		PreparedStatement pstmt = session.getSQLConnection().prepareStatement(SQL);
		pstmt.setString(1, doi.getSimpleName());
		pstmt.setString(2, doi.getSchemaName());
		return pstmt;
	}

}

Index: ProcedureSourceTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tab/ProcedureSourceTab.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProcedureSourceTab.java	25 Dec 2009 03:02:36 -0000	1.1
--- ProcedureSourceTab.java	28 Dec 2009 23:43:01 -0000	1.2
***************
*** 20,43 ****
   */
  import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab;
  import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
  
  /**
   * This class provides the necessary information to the parent tab to display the source for a Netezza 
!  * procedure.
   */
  public class ProcedureSourceTab extends FormattedSourceTab
  {
  	/**
  	 * Constructor
  	 * 
- 	 * @param hint
- 	 *           what the user sees on mouse-over tool-tip
  	 * @param stmtSep
  	 *           the string to use to separate SQL statements
  	 */
! 	public ProcedureSourceTab(String hint, String stmtSep)
  	{
! 		super(hint);
! 		super.setupFormatter(stmtSep, null);
  		super.setCompressWhitespace(true);
  		// Netezza procedure definitions include the statement separator.
--- 20,55 ----
   */
  import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab;
+ import net.sourceforge.squirrel_sql.fw.codereformat.ICodeReformator;
  import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+ import net.sourceforge.squirrel_sql.fw.util.StringManager;
+ import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
  
  /**
   * This class provides the necessary information to the parent tab to display the source for a Netezza 
!  * procedure.  It uses a custom formatter class (NetezzaProcedureFormator) that can handle formatting Netezza 
!  * stored procedures (and not much else).
   */
  public class ProcedureSourceTab extends FormattedSourceTab
  {
+ 	private static final StringManager s_stringMgr =
+ 		StringManagerFactory.getStringManager(ProcedureSourceTab.class);
+ 	
+ 	public static interface i18n
+ 	{
+ 		// i18n[ProcedureSourceTab.hint=Shows the source of the selected procedure]
+ 		String hint = s_stringMgr.getString("ProcedureSourceTab.hint");
+ 	}	
+ 	
  	/**
  	 * Constructor
  	 * 
  	 * @param stmtSep
  	 *           the string to use to separate SQL statements
  	 */
! 	public ProcedureSourceTab(String stmtSep)
  	{
! 		super(i18n.hint);
! 		ICodeReformator formator = new NetezzaProcedureFormator(stmtSep);
! 		super.setupFormatter(formator, stmtSep, null);
  		super.setCompressWhitespace(true);
  		// Netezza procedure definitions include the statement separator.
***************
*** 72,84 ****
     	return new String[] { doi.getSchemaName(), doi.getSimpleName() };		
     }
- 
- 	/**
- 	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab#processResult(java.lang.StringBuilder)
- 	 */
- 	@Override
- 	protected String processResult(StringBuilder buf)
- 	{
- 		return buf.toString().replace("/n", "\\n");
- 	}
  	
  }
--- 84,87 ----

--- NEW FILE: SynonymSourceTab.java ---
package net.sourceforge.squirrel_sql.plugins.netezza.tab;

/*
 * 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 net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;

/**
 * This class provides the necessary information to the parent tab to display the source for a Netezza
 * synonym.
 */
public class SynonymSourceTab extends FormattedSourceTab
{
	private static final StringManager s_stringMgr =
		StringManagerFactory.getStringManager(SynonymSourceTab.class);
	
	public static interface i18n
	{
		// i18n[SynonymSourceTab.hint=Shows the source of the selected synonym]
		String hint = s_stringMgr.getString("SynonymSourceTab.hint");
	}
	
	/**
	 * Constructor
	 * 
	 * @param hint
	 *           what the user sees on mouse-over tool-tip
	 * @param stmtSep
	 *           the string to use to separate SQL statements
	 */
	public SynonymSourceTab(String stmtSep)
	{
		super(i18n.hint);
		super.setupFormatter(stmtSep, null);
		super.setCompressWhitespace(true);
	}

	/**
	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement()
	 */
	@Override
	protected String getSqlStatement()
	{
		return 
		"SELECT " +
		"'create synonym ' || synonym_name || ' for ' || refobjname " +
		"FROM _v_synonym " +
		"where refdatabase = ? " +
		"and refschema = ? " +
		"and synonym_name like ? ";
	}

	/**
	 * Overridden as the super implementation binds just schemaname rather than both catalogname and schemaName
	 * as is used in Netezza.
	 * 
	 * @return a String array of bind variable values
	 */
	@Override
	protected String[] getBindValues()
	{
		final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
		return new String[] { doi.getCatalogName(), doi.getSchemaName(), doi.getSimpleName() };
	}
	
}

--- NEW FILE: NetezzaProcedureFormator.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.tab;

import java.util.ArrayList;
import java.util.List;

import net.sourceforge.squirrel_sql.fw.codereformat.ICodeReformator;

/**
 * The goal of this class is to format the stored procedure source code which comes from Netezza. For example,
 * this nicely formatted stored procedure: <code>
 * CREATE OR REPLACE PROCEDURE num() RETURNS BOOL LANGUAGE NZPLSQL AS
 * BEGIN_PROC
 * DECLARE
 * 	n NUMERIC; 
 * BEGIN
 * 	n := 2147483647;
 * 	RAISE NOTICE 'n is %', n;
 * 	n := 2147483647 + 1;
 * 	RAISE NOTICE 'n is %', n;
 * 	n := 2147483647::numeric + 1;
 * 	RAISE NOTICE 'n is %', n;
 * 	n := 2147483647::bigint + 1;
 * 	RAISE NOTICE 'n is %', n;
 * 	n := 2147483647;
 * 	n := n + 1;
 * 	RAISE NOTICE 'n is %', n;
 * 	END;
 * END_PROC;
 * 
 * comes out of the proceduresource column of the _v_procedure system tablelooking like this:
 * 
 * CREATE OR REPLACE PROCEDURE num() RETURNS BOOL LANGUAGE NZPLSQL AS BEGIN_PROC /nDECLARE/n	n NUMERIC;
 * BEGIN/n	n := 2147483647;RAISE NOTICE 'n is %', n;n := 2147483647 + 1;RAISE NOTICE 
 * 'n is %', n;n := 2147483647::numeric + 1;RAISE NOTICE 'n is %', n;n := 2147483647::bigint + 1;RAISE NOTICE 
 * 'n is %', n;n := 2147483647;n := n + 1;RAISE NOTICE 'n is %', n;END;END_PROC;
 * 
 * (Just one long line)
 */
public class NetezzaProcedureFormator implements ICodeReformator
{

	private final String stmtSep;
	
	public NetezzaProcedureFormator(String stmtSep) {
		this.stmtSep = stmtSep;
	}
	
	/**
	 * @see net.sourceforge.squirrel_sql.fw.codereformat.ICodeReformator#reformat(java.lang.String)
	 */
	@Override
	public String reformat(String in)
	{
		StringBuilder result = new StringBuilder();
		String newLinesStripped = in.replace("/n", " ");
		List<String> parts = breakApartNewLines(newLinesStripped.split("\\s+"), stmtSep);
		boolean foundAs = false;
		boolean inDeclaration = false;
		boolean inMainSection = false;
		boolean inCreateSection = true;
		for (String part : parts)
		{
			if (inCreateSection && !part.equalsIgnoreCase("AS"))
			{
				result.append(part);
				result.append(" ");
				continue;
			}
			if (part.equalsIgnoreCase("AS") && !foundAs)
			{
				foundAs = true;
				inCreateSection = false;
				result.append("AS\n");
				continue;
			}
			if (part.equalsIgnoreCase("BEGIN_PROC") && !inMainSection)
			{
				result.append("BEGIN_PROC\n");
				continue;
			}
			if (part.equalsIgnoreCase("DECLARE"))
			{
				result.append("DECLARE\n");
				inDeclaration = true;
				continue;
			}
			if (inDeclaration && !part.equalsIgnoreCase("BEGIN"))
			{
				if (!part.endsWith(stmtSep))
				{
					result.append("\t");
				}
				result.append(part);
				if (part.endsWith(stmtSep))
				{
					result.append("\n");
				}
				else
				{
					result.append(" ");
				}
				continue;
			}
			if (inDeclaration && part.equalsIgnoreCase("BEGIN"))
			{
				result.append("BEGIN\n\t");
				inDeclaration = false;
				inMainSection = true;
				continue;
			}
			if (inMainSection)
			{
				if (part.equalsIgnoreCase("END"+stmtSep) 
					|| part.equalsIgnoreCase("END"))
				{
					inMainSection = false;
					// remove the previously added tab character
					result.setLength(result.length() - 1);
					result.append(part);
					if (!part.endsWith(stmtSep)) {
						result.append(stmtSep);
					}
					result.append("\n");
				}
				else
				{
					// At this point, we have one long line of code that ends approximately with END;END_PROC with
					// statement separators interspersed.
					result.append(part);
					result.append(" ");
					if (part.endsWith(stmtSep))
					{
						result.append("\n\t");
					}
				}
				continue;
			}
			result.append(part);
			result.append(stmtSep);
			result.append("\n");
		}
		return result.toString();
	}

	private List<String> breakApartNewLines(String[] in, String stmtSep)
	{
		ArrayList<String> result = new ArrayList<String>();
		for (String part : in)
		{
			if (part.contains(stmtSep))
			{
				String[] subparts = part.split(stmtSep);
				int i = 1;
				for (String subpart : subparts)
				{
					if (i++ < subparts.length)
					{
						result.add(subpart + stmtSep);
					}
					else
					{
						result.add(subpart);
					}
				}
			}
			else
			{
				result.add(part);
			}
		}
		return result;
	}
}

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer NetezzaQueryTokenizer.java, NONE, 1.1

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22539/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer

Added Files:
	NetezzaQueryTokenizer.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: NetezzaQueryTokenizer.java ---
package net.sourceforge.squirrel_sql.plugins.netezza.tokenizer;

/*
 * Copyright (C) 2007 Rob Manning
 * man...@us...
 * 
 * Based on initial work from Johan Compagner.
 *
 * 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.util.ArrayList;
import java.util.Iterator;
import java.util.regex.Pattern;

import net.sourceforge.squirrel_sql.fw.preferences.IQueryTokenizerPreferenceBean;
import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
import net.sourceforge.squirrel_sql.fw.sql.ITokenizerFactory;
import net.sourceforge.squirrel_sql.fw.sql.QueryTokenizer;
import net.sourceforge.squirrel_sql.fw.sql.TokenizerSessPropsInteractions;
import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;

/**
 * This class is loaded by the Netezza Plugin and registered with all Netezza Sessions as the query tokenizer
 * if the plugin is loaded. It handles some of the syntax allowed in Netezza scripts that would be hard to
 * parse in a generic way for any database. It handles create statements for stored procedures.
 */
public class NetezzaQueryTokenizer extends QueryTokenizer implements IQueryTokenizer
{
	/** Logger for this class. */
	private final static ILogger s_log = LoggerController.createLogger(NetezzaQueryTokenizer.class);

	private static final String PROCEDURE_PATTERN =
		"^\\s*CREATE\\s+PROCEDURE.*|^\\s*CREATE\\s+OR\\s+REPLACE\\s+PROCEDURE\\s+.*";

	private Pattern procPattern = Pattern.compile(PROCEDURE_PATTERN, Pattern.DOTALL);

	private IQueryTokenizerPreferenceBean _prefs = null;

	public NetezzaQueryTokenizer(IQueryTokenizerPreferenceBean prefs)
	{
		super(prefs.getStatementSeparator(), prefs.getLineComment(), prefs.isRemoveMultiLineComments());
		_prefs = prefs;
	}

	public void setScriptToTokenize(String script)
	{
		super.setScriptToTokenize(script);

		// Since it is likely to have the procedure separator on it's own line,
		// and it is key to letting us know that proceeding statements form a
		// multi-statement procedure or function, it deserves it's own place in
		// the _queries arraylist. If it is followed by other procedure or
		// function creation blocks, we may fail to detect that, so this just
		// goes through the list and breaks apart statements on newline so that
		// this cannot happen.
		breakApartNewLines();

		// Netezza allows statement separators in procedure blocks. The process
		// of tokenizing above renders these procedure blocks as separate
		// statements, which are not valid to be executed separately. Here, we
		// re-assemble any create procedure statements that we
		// find using the beginning procedure block pattern and the procedure
		// separator.
		joinFragments(procPattern, false);

		_queryIterator = _queries.iterator();
	}

	/**
	 * Sets the ITokenizerFactory which is used to create additional instances of the IQueryTokenizer - this is
	 * used for handling file includes recursively.
	 */
	protected void setFactory()
	{
		_tokenizerFactory = new ITokenizerFactory()
		{
			public IQueryTokenizer getTokenizer()
			{
				return new NetezzaQueryTokenizer(_prefs);
			}
		};
	}

	/**
	 * This will loop through _queries and break apart lines that look like <code> 
	 * 
	 * list: 
	 *   element: <sep>\n\ncreate proc...
	 *    
	 * into 
	 * 
	 * list: 
	 *   element: <sep> 
	 *   element: create proc...
	 * 
	 * </code>
	 */
	private void breakApartNewLines()
	{
		ArrayList<String> tmp = new ArrayList<String>();
		String procSep = _prefs.getProcedureSeparator();
		for (Iterator<String> iter = _queries.iterator(); iter.hasNext();)
		{
			String next = iter.next();
			if (next.startsWith(procSep))
			{
				tmp.add(procSep);
				String[] parts = next.split(procSep + "\\n+");
				for (int i = 0; i < parts.length; i++)
				{
					if (!"".equals(parts[i]) && !procSep.equals(parts[i]))
					{
						tmp.add(parts[i]);
					}
				}
			}
			else if (next.endsWith(procSep))
			{
				String chopped = StringUtilities.chop(next);
				tmp.add(chopped);
				tmp.add(procSep);
			}
			else
			{
				tmp.add(next);
			}
		}
		_queries = tmp;
	}

	/**
	 * This will scan the _queries list looking for fragments matching the specified pattern and will combine
	 * successive fragments until the procedure separator is encountered which indicated the end of the code
	 * block.
	 * 
	 * @param skipStraySep
	 *           if we find a slash before matching a pattern and this is true, we will exclude it from our
	 *           list of sql queries.
	 */
	private void joinFragments(Pattern pattern, boolean skipStraySep)
	{

		boolean inMultiSQLStatement = false;
		StringBuffer collector = null;
		ArrayList<String> tmp = new ArrayList<String>();
		String procSep = _prefs.getProcedureSeparator();
		String stmtSep = _prefs.getStatementSeparator();
		for (Iterator<String> iter = _queries.iterator(); iter.hasNext();)
		{
			String next = iter.next();
			if (pattern.matcher(next.toUpperCase()).matches())
			{
				inMultiSQLStatement = true;
				collector = new StringBuffer(next);
				collector.append(stmtSep);
				continue;
			}
			if (next.startsWith(procSep))
			{
				inMultiSQLStatement = false;
				if (collector != null)
				{
					// For Netezza, the procedure and statement separator must be appended - they are part of the 
					// statement.
					collector.append(procSep);
					collector.append(stmtSep);
					tmp.add(collector.toString());
					collector = null;
				}
				else
				{
					if (skipStraySep)
					{
						// Stray sep - or we failed to find pattern
						if (s_log.isDebugEnabled())
						{
							s_log.debug("Detected stray procedure separator(" + procSep + "). Skipping");
						}
					}
					else
					{
						tmp.add(next);
					}
				}
				continue;
			}
			if (inMultiSQLStatement)
			{
				collector.append(next);
				collector.append(stmtSep);
				continue;
			}
			tmp.add(next);
		}
		_queries = tmp;
	}

	@Override
	public TokenizerSessPropsInteractions getTokenizerSessPropsInteractions()
	{
		if (_prefs.isInstallCustomQueryTokenizer())
		{
			TokenizerSessPropsInteractions ret = new TokenizerSessPropsInteractions();
			ret.setTokenizerDefinesRemoveMultiLineComment(true);
			ret.setTokenizerDefinesStartOfLineComment(true);
			ret.setTokenizerDefinesStatementSeparator(true);

			return ret;
		}
		else
		{
			return super.getTokenizerSessPropsInteractions();
		}
	}

}

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/exp NetezzaSynonymParentExpander.java, NONE, 1.1 NetezzaSynonymInodeExpanderFactory.java, NONE, 1.1 NetezzaSequenceParentExtractorImpl.java, 1.1, 1.2

[Rob M. <man...@us...>]

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());
  	}
  

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer - New directory

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22521/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer

Log Message:
Directory /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer added to the repository

[Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer NetezzaQueryTokenizerTest.java, NONE, 1.1

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22062/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer

Added Files:
	NetezzaQueryTokenizerTest.java 
Log Message:
Tests for various Netezza plugin classes.

--- NEW FILE: NetezzaQueryTokenizerTest.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.tokenizer;

import static org.junit.Assert.assertEquals;
import net.sourceforge.squirrel_sql.BaseSQuirreLJUnit4TestCase;
import net.sourceforge.squirrel_sql.fw.preferences.IQueryTokenizerPreferenceBean;

import org.easymock.classextension.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;


public class NetezzaQueryTokenizerTest extends BaseSQuirreLJUnit4TestCase
{
	private static final String storedProcSQL = 

		"CREATE OR REPLACE PROCEDURE exec_nzplsql_block(text) RETURNS BOOLEAN \n" +
		"LANGUAGE NZPLSQL AS \n" +
		"BEGIN_PROC \n" +
		"DECLARE lRet BOOLEAN; \n" +
		"DECLARE sid INTEGER; \n" +
		"DECLARE nm varchar; \n" +
		"DECLARE cr varchar; \n" +
		"BEGIN \n" +
		"sid := current_sid; \n" +
		"nm := 'any_block' || sid || '()'; \n" +
		"cr = 'CREATE OR REPLACE PROCEDURE ' || nm || \n" +
		"' RETURNS BOOL LANGUAGE NZPLSQL AS BEGIN_PROC ' \n" +
		"|| $1 || ' END_PROC'; \n" +
		"EXECUTE IMMEDIATE cr; \n" +
		"EXECUTE IMMEDIATE 'SELECT ' || nm; \n" +
		"EXECUTE IMMEDIATE 'DROP PROCEDURE ' || nm; \n" +
		"RETURN TRUE; \n" +
		"END; \n" +
		"END_PROC; \n";
	
	private NetezzaQueryTokenizer classUnderTest = null;
	
   // Mock Objects
   IQueryTokenizerPreferenceBean prefsBean = 
       EasyMock.createMock(IQueryTokenizerPreferenceBean.class);

   @Before
   public void setUp() throws Exception {
       EasyMock.expect(prefsBean.getStatementSeparator()).andReturn(";").anyTimes();
       EasyMock.expect(prefsBean.getProcedureSeparator()).andReturn("END_PROC").anyTimes();
       EasyMock.expect(prefsBean.getLineComment()).andReturn("--").anyTimes();
       EasyMock.expect(prefsBean.isRemoveMultiLineComments()).andReturn(false).anyTimes();
       EasyMock.replay(prefsBean);
       classUnderTest = new NetezzaQueryTokenizer(prefsBean);
   }

   @After
   public void tearDown() throws Exception {
   	classUnderTest = null;
   }

   @Test
   public final void testSetScriptToTokenizeOneProc() {
   	classUnderTest.setScriptToTokenize(storedProcSQL);
   	while (classUnderTest.hasQuery()) {
   		System.err.println("query: "+classUnderTest.nextQuery());
   	}
   	assertEquals(1, classUnderTest.getQueryCount());
   	
   }
   
   @Test
   public final void testSetScriptToTokenizeMultipleProcs() {
       StringBuilder script = new StringBuilder();
       for (int i = 0; i < 5; i++) {
           script.append(storedProcSQL);
           script.append("\n");
       }
       classUnderTest.setScriptToTokenize(script.toString());
       assertEquals(5, classUnderTest.getQueryCount());
   }
   
	
}

[Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tab NetezzaProcedureFormatorTest.java, NONE, 1.1

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tab
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22062/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tab

Added Files:
	NetezzaProcedureFormatorTest.java 
Log Message:
Tests for various Netezza plugin classes.

--- NEW FILE: NetezzaProcedureFormatorTest.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.tab;

import static org.junit.Assert.assertEquals;

import org.junit.After;
import org.junit.Before;
import org.junit.Test;


public class NetezzaProcedureFormatorTest
{
	private NetezzaProcedureFormator classUnderTest = null;
	
	private static final String SQL = 
		"CREATE OR REPLACE PROCEDURE num() RETURNS BOOL LANGUAGE NZPLSQL AS BEGIN_PROC/n DECLARE/n	" +
		"n NUMERIC;BEGIN/n	n := 2147483647;RAISE NOTICE 'n is %', n;n := 2147483647 + 1;" +
		"RAISE NOTICE 'n is %', n;n := 2147483647::numeric + 1;RAISE NOTICE 'n is %', n;" +
		"n := 2147483647::bigint + 1;RAISE NOTICE 'n is %', n;n := 2147483647;n := n + 1;" +
		"RAISE NOTICE 'n is %', n;END;END_PROC;";
	
	private static final String SQL2 = 
		  "create or replace procedure EXEC_NZPLSQL_BLOCK(TEXT) returns BOOLEAN LANGUAGE NZPLSQL AS " +
		  "BEGIN_PROC/nDECLARE lRet BOOLEAN;DECLARE sid INTEGER;DECLARE nm varchar;DECLARE cr varchar;BEGIN  " +
		  "/nsid := current_sid;nm := 'any_block' || sid || '()';cr = 'CREATE OR REPLACE PROCEDURE ' || " +
		  "nm ||  /n' RETURNS BOOL LANGUAGE NZPLSQL AS BEGIN_PROC '  /n|| $1 || ' END_PROC';EXECUTE IMMEDIATE " +
		  "cr;EXECUTE IMMEDIATE 'SELECT ' || nm;EXECUTE IMMEDIATE 'DROP PROCEDURE ' || nm;RETURN TRUE;END;" +
		  "END_PROC;";		
	
	@Before
	public void setup() {
		classUnderTest = new NetezzaProcedureFormator(";");
	}
	
	@After
	public void teardown() {
		classUnderTest = null;
	}
	
	/**
	 * This test should produce output that looks like this:
	 * 
		CREATE OR REPLACE PROCEDURE num() RETURNS BOOL LANGUAGE NZPLSQL AS
		BEGIN_PROC
		DECLARE
			n NUMERIC;
		BEGIN
			n := 2147483647; 
			RAISE NOTICE 'n is %', n; 
			n := 2147483647 + 1; 
			RAISE NOTICE 'n is %', n; 
			n := 2147483647::numeric + 1; 
			RAISE NOTICE 'n is %', n; 
			n := 2147483647::bigint + 1; 
			RAISE NOTICE 'n is %', n; 
			n := 2147483647; 
			n := n + 1; 
			RAISE NOTICE 'n is %', n; 
		END;
		END_PROC;
	 *  
	 */
	@Test
	public void testformat() {
		String newSql = classUnderTest.reformat(SQL);
		//System.err.println("formatted query: \n"+newSql);
		String[] parts = newSql.split("\n");
		assertEquals(18, parts.length);
	}
	/**
	 * This test should produce output that looks like this:
	 * 
		CREATE OR REPLACE PROCEDURE exec_nzplsql_block(text) RETURNS BOOLEAN
		LANGUAGE NZPLSQL AS
		BEGIN_PROC
			DECLARE lRet BOOLEAN;
			DECLARE sid INTEGER;
			DECLARE nm varchar;
			DECLARE cr varchar;
		BEGIN
			sid := current_sid;
			nm := 'any_block' || sid || '()';
			cr = 'CREATE OR REPLACE PROCEDURE ' || nm || ' RETURNS BOOL LANGUAGE NZPLSQL AS BEGIN_PROC ' || $1 || ' END_PROC';
			EXECUTE IMMEDIATE cr;
			EXECUTE IMMEDIATE 'SELECT ' || nm;
			EXECUTE IMMEDIATE 'DROP PROCEDURE ' || nm;
			RETURN TRUE;
		END;
		END_PROC; 
	 */
	@Test
	public void testformat2() {
		String newSql = classUnderTest.reformat(SQL2);
		//System.err.println("formatted query: \n"+newSql);
		String[] parts = newSql.split("\n");
		assertEquals(20, parts.length);
	}

	
}

[Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer - New directory

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22029/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer

Log Message:
Directory /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tokenizer added to the repository

[Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tab - New directory

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tab
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22029/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tab

Log Message:
Directory /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza/tab added to the repository

[Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza - New directory

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv22029/test/src/net/sourceforge/squirrel_sql/plugins/netezza

Log Message:
Directory /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/plugins/netezza added to the repository

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs FormattedSourceTab.java, 1.9, 1.10

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21776/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs

Modified Files:
	FormattedSourceTab.java 
Log Message:
Introduced new API method that allows plugins to install a custom formatter class.  This can be particularly useful for stored procedures which would be very hard to write a good generic pretty-printer.

Index: FormattedSourceTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/FormattedSourceTab.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FormattedSourceTab.java	25 Dec 2009 03:00:47 -0000	1.9
--- FormattedSourceTab.java	28 Dec 2009 23:39:21 -0000	1.10
***************
*** 29,32 ****
--- 29,33 ----
  import net.sourceforge.squirrel_sql.fw.codereformat.CodeReformator;
  import net.sourceforge.squirrel_sql.fw.codereformat.CommentSpec;
+ import net.sourceforge.squirrel_sql.fw.codereformat.ICodeReformator;
  import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
  import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
***************
*** 55,59 ****
  
  	/** does the work of formatting */
! 	private CodeReformator formatter = null;
  
  	/** whether or not to compress whitespace */
--- 56,60 ----
  
  	/** does the work of formatting */
! 	private ICodeReformator formatter = null;
  
  	/** whether or not to compress whitespace */
***************
*** 103,106 ****
--- 104,130 ----
  
  	/**
+ 	 * Sets up a custom formatter implementation which is used to format the source after retrieving it from 
+ 	 * the ResultSet. If this is not setup prior to loading, then the formatter will not be used - only 
+ 	 * whitespace compressed if so enabled.
+ 	 * 
+ 	 * @param codeReformator
+ 	 * @param stmtSep
+ 	 *           the formatter needs to know what the statement separator is.
+ 	 * @param commentSpecs
+ 	 *           the types of comments that can be found in the source code. This can be null, and if so, the
+ 	 *           standard comment styles are used (i.e. -- and c-style comments)
+ 	 */
+ 	protected void setupFormatter(ICodeReformator codeReformator, String stmtSep, CommentSpec[] commentSpecs)
+ 	{
+ 		if (commentSpecs != null)
+ 		{
+ 			this.commentSpecs = commentSpecs;
+ 		}
+ 		statementSeparator = stmtSep;
+ 		formatter = codeReformator;
+ 	}
+ 	
+ 	
+ 	/**
  	 * Whether or not to convert multiple consecutive spaces into a single space.
  	 * 
***************
*** 181,184 ****
--- 205,209 ----
  				}
  				_ta.setCaretPosition(0);
+ 				_ta.setTabSize(4);
  
  			}

[Squirrel-sql-commits] sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tokenizer MysqlQueryTokenizer.java, 1.2, 1.3

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tokenizer
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21236/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tokenizer

Modified Files:
	MysqlQueryTokenizer.java 
Log Message:
Fixed javadoc to give a better explanation of the effects of the method.

Index: MysqlQueryTokenizer.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tokenizer/MysqlQueryTokenizer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MysqlQueryTokenizer.java	13 Jul 2009 23:24:54 -0000	1.2
--- MysqlQueryTokenizer.java	28 Dec 2009 23:36:25 -0000	1.3
***************
*** 117,126 ****
      /** 
       * This will loop through _queries and break apart lines that look like
       * 
!      *   <sep>\n\ncreate proc...
       * into
       * 
!      *   <sep>
!      *   create proc...
       */
      private void breakApartNewLines() {
--- 117,132 ----
      /** 
       * This will loop through _queries and break apart lines that look like
+      * <code>
       * 
!      * list:
!      *   element: <sep>\n\ncreate proc...
!      *   
       * into
       * 
!      * list:
!      *   element: <sep>
!      *   element: create proc...
!      *   
!      * </code>
       */
      private void breakApartNewLines() {

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql DatabaseObjectType.java, 1.15, 1.16 I18NStrings.properties, 1.10, 1.11

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv21013/fw/src/net/sourceforge/squirrel_sql/fw/sql

Modified Files:
	DatabaseObjectType.java I18NStrings.properties 
Log Message:
Added support for synonyms.  Since this type is supported by a few databases it just makes better sense to give it a type here to avoid repeating code.

Index: DatabaseObjectType.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/DatabaseObjectType.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DatabaseObjectType.java	5 Mar 2009 00:14:11 -0000	1.15
--- DatabaseObjectType.java	28 Dec 2009 23:35:22 -0000	1.16
***************
*** 114,117 ****
--- 114,123 ----
     public final static DatabaseObjectType SEQUENCE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.sequence");
  
+    /**
+     * An object that is an alias for another object.  While support for this isn't standardized or universal
+     * this type of object is found in a few different databases (e.g. Oracle, Netezza)
+     */
+    public final static DatabaseObjectType SYNONYM = createNewDatabaseObjectTypeI18n("DatabaseObjectType.synonym");
+    
     /** TABLE. */
     public final static DatabaseObjectType TABLE = createNewDatabaseObjectTypeI18n("DatabaseObjectType.table");

Index: I18NStrings.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/I18NStrings.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** I18NStrings.properties	5 Mar 2009 00:14:11 -0000	1.10
--- I18NStrings.properties	28 Dec 2009 23:35:22 -0000	1.11
***************
*** 15,18 ****
--- 15,19 ----
  DatabaseObjectType.schema=Schema
  DatabaseObjectType.sequence=Sequence
+ DatabaseObjectType.synonym=Synonym
  DatabaseObjectType.table=Table
  DatabaseObjectType.view=View

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql SQLDatabaseMetaData.java, 1.62, 1.63

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20749/fw/src/net/sourceforge/squirrel_sql/fw/sql

Modified Files:
	SQLDatabaseMetaData.java 
Log Message:
work-around for Netezza bug (it does support catalogs in data manipulation).

Index: SQLDatabaseMetaData.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/SQLDatabaseMetaData.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** SQLDatabaseMetaData.java	28 Dec 2009 15:51:08 -0000	1.62
--- SQLDatabaseMetaData.java	28 Dec 2009 23:34:06 -0000	1.63
***************
*** 444,449 ****
  	}
  
! 	/* Not cached.
! 	 * (non-Javadoc)
  	 * @see net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData#getCatalogs()
  	 */
--- 444,451 ----
  	}
  
! 	/** 
! 	 * Not cached because we want to allow the user to pickup changes to this list (e.g. refreshing the object
! 	 * tree) without requiring them to delete the cache.
! 	 * 
  	 * @see net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData#getCatalogs()
  	 */
***************
*** 615,618 ****
--- 617,625 ----
  			throw ex;
  		}
+ 		
+ 		// Netezza bug; It supports both catalogs and schemas in SQL statements, yet returns false.
+ 		if (DialectFactory.isNetezza(this)) {
+ 			value = true;
+ 		}
  		_cache.put(key, value);
  

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/codereformat ICodeReformator.java, NONE, 1.1 CodeReformator.java, 1.5, 1.6

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/codereformat
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv20477/fw/src/net/sourceforge/squirrel_sql/fw/codereformat

Modified Files:
	CodeReformator.java 
Added Files:
	ICodeReformator.java 
Log Message:
Introduced interface to define plugin-specific formatter classes.

Index: CodeReformator.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/codereformat/CodeReformator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CodeReformator.java	15 Jul 2008 22:10:42 -0000	1.5
--- CodeReformator.java	28 Dec 2009 23:32:59 -0000	1.6
***************
*** 29,33 ****
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  
! public class CodeReformator {
      private static final StringManager s_stringMgr = StringManagerFactory
              .getStringManager(CodeReformator.class);
--- 29,33 ----
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  
! public class CodeReformator implements ICodeReformator {
      private static final StringManager s_stringMgr = StringManagerFactory
              .getStringManager(CodeReformator.class);
***************
*** 51,55 ****
      }
  
!     public String reformat(String in) {
          in = flatenWhiteSpaces(in, false);
  
--- 51,58 ----
      }
  
!     /**
! 	 * @see net.sourceforge.squirrel_sql.fw.codereformat.ICodeReformator#reformat(java.lang.String)
! 	 */
!    public String reformat(String in) {
          in = flatenWhiteSpaces(in, false);
  

--- NEW FILE: ICodeReformator.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.fw.codereformat;

/**
 * An interface to allow alternate implementations of the CodeReformator to be configured by plugins.
 */
public interface ICodeReformator
{
	/**
	 * Reformats the specified String, returning the reformatted version.
	 * 
	 * @param in
	 *           the string to apply formatting to.
	 * @return the formatted result
	 */
	String reformat(String in);
}

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql SQLDatabaseMetaData.java, 1.61, 1.62

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31986/fw/src/net/sourceforge/squirrel_sql/fw/sql

Modified Files:
	SQLDatabaseMetaData.java 
Log Message:
Fixed javadoc and re-format.  No functional changes.

Index: SQLDatabaseMetaData.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/SQLDatabaseMetaData.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** SQLDatabaseMetaData.java	25 Dec 2009 02:59:28 -0000	1.61
--- SQLDatabaseMetaData.java	28 Dec 2009 15:51:08 -0000	1.62
***************
*** 1,3 ****
--- 1,4 ----
  package net.sourceforge.squirrel_sql.fw.sql;
+ 
  /*
   * Copyright (C) 2002-2003 Colin Bell
***************
*** 42,69 ****
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  /**
[...3564 lines suppressed...]
+ 	/**
+ 	 * Check the thread of the caller to see if it is the event dispatch thread and if we are debugging print a
+ 	 * debug log message with the call trace.
+ 	 */
+ 	private void checkThread()
+ 	{
+ 		/* This is extremely useful when trying to track down Swing UI freezing.
+ 		 * However, it currently fills the log which obscures other debug 
+ 		 * messages even though UI performance is acceptable, so it is commented 
+ 		 * out until it is needed later. 
+ 		if (s_log.isDebugEnabled() && SwingUtilities.isEventDispatchThread()) {
+ 		    try {
+ 		        throw new Exception("GUI Thread is doing database work");
+ 		    } catch (Exception e) {
+ 		        s_log.debug(e.getMessage(), e);
+ 		    }
+ 		}
+ 		*/
+ 	}
+ }

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects SequencePropertyMutability.java, 1.1, 1.2 NetezzaDialextExt.java, 1.1, 1.2

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv19110/fw/src/net/sourceforge/squirrel_sql/fw/dialects

Modified Files:
	SequencePropertyMutability.java NetezzaDialextExt.java 
Log Message:
Finished dialect (tested against Netezza 4.6)

Index: SequencePropertyMutability.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/SequencePropertyMutability.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SequencePropertyMutability.java	25 Feb 2008 11:44:48 -0000	1.1
--- SequencePropertyMutability.java	28 Dec 2009 01:48:10 -0000	1.2
***************
*** 21,25 ****
  /**
   * A class that represents what properties of a sequence can be modified (increment, start, cycle, 
!  * cache, etc.)  Some databases (such as HSQLDB) restrict what properties of a sequence can be modified.   
   * 
   * @author manningr
--- 21,26 ----
  /**
   * A class that represents what properties of a sequence can be modified (increment, start, cycle, 
!  * cache, etc.)  Some databases (such as HSQLDB and Netezza) restrict what properties of a sequence can be 
!  * modified.   
   * 
   * @author manningr

Index: NetezzaDialextExt.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/NetezzaDialextExt.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NetezzaDialextExt.java	25 Dec 2009 02:58:30 -0000	1.1
--- NetezzaDialextExt.java	28 Dec 2009 01:48:11 -0000	1.2
***************
*** 29,32 ****
--- 29,33 ----
  
  import java.sql.Types;
+ import java.util.Collection;
  import java.util.HashMap;
  import java.util.List;
***************
*** 43,46 ****
--- 44,48 ----
  public class NetezzaDialextExt extends CommonHibernateDialect
  {
+ 
  	// Note that Netezza 4.6 doesn't have support for LOB data types. Under the hood, it appears to use
  	// PostgreSQL, but with some limitations.
***************
*** 593,597 ****
  
  	/**
! 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnNameAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier, net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
  	 */
  	@Override
--- 595,602 ----
  
  	/**
! 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnNameAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
! 	 *      net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
! 	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
! 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
  	 */
  	@Override
***************
*** 604,606 ****
--- 609,767 ----
  	}
  
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getRenameTableSQL(java.lang.String,
+ 	 *      java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ 	 */
+ 	@Override
+ 	public String getRenameTableSQL(String oldTableName, String newTableName,
+ 		DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ 	{
+ 		return DialectUtils.getRenameTableSQL(oldTableName, newTableName, qualifier, prefs, this);
+ 	}
+ 
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getCreateViewSQL(java.lang.String,
+ 	 *      java.lang.String, java.lang.String,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ 	 */
+ 	@Override
+ 	public String getCreateViewSQL(String viewName, String definition, String checkOption,
+ 		DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ 	{
+ 		return DialectUtils.getCreateViewSQL(viewName, definition, checkOption, qualifier, prefs, this);
+ 	}
+ 
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getRenameViewSQL(java.lang.String,
+ 	 *      java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ 	 */
+ 	@Override
+ 	public String[] getRenameViewSQL(String oldViewName, String newViewName,
+ 		DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ 	{
+ 
+ 		String commandPrefix = DialectUtils.ALTER_VIEW_CLAUSE;
+ 		String renameClause = DialectUtils.RENAME_TO_CLAUSE;
+ 		return new String[] { DialectUtils.getRenameViewSQL(commandPrefix, renameClause, oldViewName,
+ 			newViewName, qualifier, prefs, this) };
+ 	}
+ 
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getViewDefinitionSQL(java.lang.String,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ 	 */
+ 	@Override
+ 	public String getViewDefinitionSQL(String viewName, DatabaseObjectQualifier qualifier,
+ 		SqlGenerationPreferences prefs)
+ 	{
+ 		return "SELECT 'create or replace view ' || v.VIEWNAME || ' as ' || "
+ 			+ "v.definition FROM _v_view v, _v_objs_owned o " + "where v.objid = o.objid "
+ 			+ "and o.DATABASE = '" + qualifier.getCatalog() + "' " + "and v.VIEWNAME = '" + viewName + "'";
+ 	}
+ 
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getCreateSequenceSQL(java.lang.String,
+ 	 *      java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ 	 */
+ 	@Override
+ 	public String getCreateSequenceSQL(String sequenceName, String increment, String minimum, String maximum,
+ 		String start, String cache, boolean cycle, DatabaseObjectQualifier qualifier,
+ 		SqlGenerationPreferences prefs)
+ 	{
+ 		final String minimumClause = DialectUtils.MINVALUE_CLAUSE;
+ 		final String maximumClause = DialectUtils.MAXVALUE_CLAUSE;
+ 
+ 		String cycleClause = DialectUtils.CYCLE_CLAUSE;
+ 		if (!cycle)
+ 		{
+ 			cycleClause = DialectUtils.NO_CYCLE_CLAUSE;
+ 		}
+ 
+ 		return DialectUtils.getCreateSequenceSQL(sequenceName, increment, minimumClause, minimum,
+ 			maximumClause, maximum, start, cache, cycleClause, qualifier, prefs, this);
+ 	}
+ 
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getAlterSequenceSQL(java.lang.String,
+ 	 *      java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, boolean,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ 	 */
+ 	@Override
+ 	public String[] getAlterSequenceSQL(String sequenceName, String increment, String minimum, String maximum,
+ 		String restart, String cache, boolean cycle, DatabaseObjectQualifier qualifier,
+ 		SqlGenerationPreferences prefs)
+ 	{
+ 		String cycleClause = DialectUtils.CYCLE_CLAUSE;
+ 		if (!cycle)
+ 		{
+ 			cycleClause = DialectUtils.NO_CYCLE_CLAUSE;
+ 		}
+ 
+ 		return new String[] { DialectUtils.getAlterSequenceSQL(sequenceName, increment, minimum, maximum,
+ 			restart, cache, cycleClause, qualifier, prefs, this) };
+ 	}
+ 
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getSequencePropertyMutability()
+ 	 */
+ 	@Override
+ 	public SequencePropertyMutability getSequencePropertyMutability()
+ 	{
+ 		SequencePropertyMutability result = new SequencePropertyMutability();
+ 		result.setCache(false);
+ 		return result;
+ 	}
+ 
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getAddForeignKeyConstraintSQL(java.lang.String,
+ 	 *      java.lang.String, java.lang.String, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean,
+ 	 *      boolean, java.lang.String, java.util.Collection, java.lang.String, java.lang.String,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ 	 */
+ 	@Override
+ 	public String[] getAddForeignKeyConstraintSQL(String localTableName, String refTableName,
+ 		String constraintName, Boolean deferrable, Boolean initiallyDeferred, Boolean matchFull,
+ 		boolean autoFKIndex, String fkIndexName, Collection<String[]> localRefColumns, String onUpdateAction,
+ 		String onDeleteAction, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ 	{
+ 		return DialectUtils.getAddForeignKeyConstraintSQL(localTableName, refTableName, constraintName,
+ 			deferrable, initiallyDeferred, matchFull, autoFKIndex, fkIndexName, localRefColumns, onUpdateAction,
+ 			onDeleteAction, qualifier, prefs, this);
+ 	}
+ 
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getAddUniqueConstraintSQL(java.lang.String,
+ 	 *      java.lang.String, net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo[],
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ 	 */
+ 	@Override
+ 	public String[] getAddUniqueConstraintSQL(String tableName, String constraintName,
+ 		TableColumnInfo[] columns, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ 	{
+ 		return new String[] { DialectUtils.getAddUniqueConstraintSQL(tableName, constraintName, columns,
+ 			qualifier, prefs, this) };
+ 	}
+ 
+ 	/**
+ 	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getDropConstraintSQL(java.lang.String,
+ 	 *      java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
+ 	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
+ 	 */
+ 	@Override
+ 	public String getDropConstraintSQL(String tableName, String constraintName,
+ 		DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
+ 	{
+ 		return DialectUtils.getDropConstraintSQL(tableName, constraintName, qualifier, prefs, this)
+ 			+ " RESTRICT";
+ 	}
+ 
  }

[Squirrel-sql-commits] sql12/test/external/net/sourceforge/squirrel_sql/fw/dialects DialectExternalTest.java, 1.20, 1.21

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/test/external/net/sourceforge/squirrel_sql/fw/dialects
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv23892/test/external/net/sourceforge/squirrel_sql/fw/dialects

Modified Files:
	DialectExternalTest.java 
Log Message:
Finished consolidating calls to fixIdentifierCase in one place

Index: DialectExternalTest.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/external/net/sourceforge/squirrel_sql/fw/dialects/DialectExternalTest.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** DialectExternalTest.java	24 Dec 2009 21:01:46 -0000	1.20
--- DialectExternalTest.java	25 Dec 2009 19:27:49 -0000	1.21
***************
*** 197,200 ****
--- 197,202 ----
  	private static String columnAddedColumnName = "columnAdded";
  
+ 	private static String newNameColumeName = "newNameCol";
+ 
  	private static String testSequenceName = "testSequence";
  
***************
*** 221,224 ****
--- 223,228 ----
  	private static String testCreateIndexTable = "createIndexTest";
  
+ 	private static String testDefaultTableName = "TESTDEFAULT";
+ 
  	private static String testFirstMergeTable = "firstTableToBeMerged";
  
***************
*** 255,258 ****
--- 259,266 ----
  	private static String testTableFiveTableName = "test5";
  
+ 	private static String testTableATableName = "a";
+ 
+ 	private static String testMaterializedViewName = "MATVIEW";
+ 
  	/**
  	 * this is set to true to try to derive SQL for the dialect being tested automatically, using other
***************
*** 525,528 ****
--- 533,537 ----
  		indexTestColumnName = fixIdentifierCase(session, indexTestColumnName);
  		integerColumnForSetDefaultColumnName = fixIdentifierCase(session, integerColumnForSetDefaultColumnName);
+ 		newNameColumeName = fixIdentifierCase(session, newNameColumeName);
  		nullVarcharColumnName = fixIdentifierCase(session, nullVarcharColumnName);
  		primaryKeyTestColumnOne = fixIdentifierCase(session, primaryKeyTestColumnOne);
***************
*** 538,551 ****
--- 547,571 ----
  
  		// fix table name case
+ 
  		autoIncrementTableName = fixIdentifierCase(session, autoIncrementTableName);
  		fkChildTableName = fixIdentifierCase(session, fkChildTableName);
  		fkParentTableName = fixIdentifierCase(session, fkParentTableName);
+ 		integerDataTableName = fixIdentifierCase(session, integerDataTableName);
  		pkTestTableName = fixIdentifierCase(session, pkTestTableName);
+ 		testCreateIndexTable = fixIdentifierCase(session, testCreateIndexTable);
  		testCreateTable = fixIdentifierCase(session, testCreateTable);
  		testCreateViewTable = fixIdentifierCase(session, testCreateViewTable);
+ 		testDefaultTableName = fixIdentifierCase(session, testDefaultTableName);
+ 		testFirstMergeTable = fixIdentifierCase(session, testFirstMergeTable);
+ 		testInsertIntoTable = fixIdentifierCase(session, testInsertIntoTable);
+ 		testNewTimestampTable = fixIdentifierCase(session, testNewTimestampTable);
  		testRenameTableAfter = fixIdentifierCase(session, testRenameTableAfter);
  		testRenameTableBefore = fixIdentifierCase(session, testRenameTableBefore);
+ 		testSecondMergeTable = fixIdentifierCase(session, testSecondMergeTable);
+ 		testTableATableName = fixIdentifierCase(session, testTableATableName);
  		testTableNameForRenameColumn = fixIdentifierCase(session, testTableNameForRenameColumn);
  		testTableForAlterColumnDefault = fixIdentifierCase(session, testTableForAlterColumnDefault);
+ 		testTableForDropView = fixIdentifierCase(session, testTableForDropView);
+ 		testTableForGetViewDefinition = fixIdentifierCase(session, testTableForGetViewDefinition);
  		testTableZeroTableName = fixIdentifierCase(session, testTableZeroTableName);
  		testTableOneTableName = fixIdentifierCase(session, testTableOneTableName);
***************
*** 554,557 ****
--- 574,579 ----
  		testTableFourTableName = fixIdentifierCase(session, testTableFourTableName);
  		testTableFiveTableName = fixIdentifierCase(session, testTableFiveTableName);
+ 
+ 		testTimestampTable = fixIdentifierCase(session, testTimestampTable);
  		testUniqueConstraintTableName = fixIdentifierCase(session, testUniqueConstraintTableName);
  
***************
*** 561,564 ****
--- 583,589 ----
  		testView2Name = fixIdentifierCase(session, testView2Name);
  		testViewToBeDropped = fixIdentifierCase(session, testViewToBeDropped);
+ 
+ 		// fix materialized view name case
+ 		testMaterializedViewName = fixIdentifierCase(session, testMaterializedViewName);
  	}
  
***************
*** 782,802 ****
  		dropTable(session, testRenameTableAfter);
  		dropTable(session, testCreateViewTable);
! 		dropTable(session, fixIdentifierCase(session, testCreateIndexTable));
! 		dropTable(session, fixIdentifierCase(session, testTableForAlterColumnDefault));
! 		dropTable(session, fixIdentifierCase(session, testTimestampTable));
! 		dropTable(session, fixIdentifierCase(session, testNewTimestampTable));
  		dropTable(session, fkChildTableName);
! 		dropTable(session, fixIdentifierCase(session, fkParentTableName));
  		dropTable(session, testUniqueConstraintTableName);
! 		dropTable(session, fixIdentifierCase(session, autoIncrementTableName));
! 		dropTable(session, fixIdentifierCase(session, integerDataTableName));
! 		dropTable(session, fixIdentifierCase(session, "a"));
  		dropTable(session, testCreateTable);
! 		dropTable(session, fixIdentifierCase(session, testInsertIntoTable));
! 		dropTable(session, fixIdentifierCase(session, testFirstMergeTable));
! 		dropTable(session, fixIdentifierCase(session, testSecondMergeTable));
! 		dropTable(session, fixIdentifierCase(session, testTableForDropView));
! 		dropTable(session, fixIdentifierCase(session, testTableForGetViewDefinition));
! 		dropTable(session, fixIdentifierCase(session, testTableNameForRenameColumn));
  
  		// Now sequences should go.
--- 807,827 ----
  		dropTable(session, testRenameTableAfter);
  		dropTable(session, testCreateViewTable);
! 		dropTable(session, testCreateIndexTable);
! 		dropTable(session, testTableForAlterColumnDefault);
! 		dropTable(session, testTimestampTable);
! 		dropTable(session, testNewTimestampTable);
  		dropTable(session, fkChildTableName);
! 		dropTable(session, fkParentTableName);
  		dropTable(session, testUniqueConstraintTableName);
! 		dropTable(session, autoIncrementTableName);
! 		dropTable(session, integerDataTableName);
! 		dropTable(session, testTableATableName);
  		dropTable(session, testCreateTable);
! 		dropTable(session, testInsertIntoTable);
! 		dropTable(session, testFirstMergeTable);
! 		dropTable(session, testSecondMergeTable);
! 		dropTable(session, testTableForDropView);
! 		dropTable(session, testTableForGetViewDefinition);
! 		dropTable(session, testTableNameForRenameColumn);
  
  		// Now sequences should go.
***************
*** 809,813 ****
  		if (DialectFactory.isOracle(session.getMetaData()))
  		{
! 			dropTable(session, fixIdentifierCase(session, "matview"));
  		}
  
--- 834,838 ----
  		if (DialectFactory.isOracle(session.getMetaData()))
  		{
! 			dropTable(session, testMaterializedViewName);
  		}
  
***************
*** 826,836 ****
  			// column(s) that comprise the PK were originally there when created
  			// *and* created not null.
! 			runSQL(session, "create table " + fixIdentifierCase(session, testTableZeroTableName)
! 				+ " ( mychar char(10), " + DB2_PK_COLNAME + " integer not null)");
  		}
  		else
  		{
! 			runSQL(session, "create table " + fixIdentifierCase(session, testTableZeroTableName)
! 				+ " ( mychar char(10))" + pageSizeClause);
  		}
  
--- 851,860 ----
  			// column(s) that comprise the PK were originally there when created
  			// *and* created not null.
! 			runSQL(session, "create table " + testTableZeroTableName + " ( mychar char(10), " + DB2_PK_COLNAME
! 				+ " integer not null)");
  		}
  		else
  		{
! 			runSQL(session, "create table " + testTableZeroTableName + " ( mychar char(10))" + pageSizeClause);
  		}
  
***************
*** 843,850 ****
  		runSQL(session, "create table " + testCreateViewTable + " ( mychar char(10))" + pageSizeClause);
  		// MySQL spatial index requires a not null column
! 		runSQL(session, "create table " + fixIdentifierCase(session, testCreateIndexTable) + " ( "
! 			+ indexTestColumnName + " varchar(10) not null, " + uniqueIndexTestColumnName + " varchar(10))"
! 			+ pageSizeClause);
! 		runSQL(session, "create table " + fixIdentifierCase(session, testTableForAlterColumnDefault) + " ( "
  			+ varcharColumnForSetDefaultColumnName + " varchar(10) , " + integerColumnForSetDefaultColumnName
  			+ " integer ) " + pageSizeClause);
--- 867,873 ----
  		runSQL(session, "create table " + testCreateViewTable + " ( mychar char(10))" + pageSizeClause);
  		// MySQL spatial index requires a not null column
! 		runSQL(session, "create table " + testCreateIndexTable + " ( " + indexTestColumnName
! 			+ " varchar(10) not null, " + uniqueIndexTestColumnName + " varchar(10))" + pageSizeClause);
! 		runSQL(session, "create table " + testTableForAlterColumnDefault + " ( "
  			+ varcharColumnForSetDefaultColumnName + " varchar(10) , " + integerColumnForSetDefaultColumnName
  			+ " integer ) " + pageSizeClause);
***************
*** 858,921 ****
  			+ " char(10), " + secondUniqueColumnName + " char(10))" + pageSizeClause);
  
! 		runSQL(session, "create table " + fixIdentifierCase(session, autoIncrementTableName) + " ( "
! 			+ autoIncrementColumnName + " integer)" + pageSizeClause);
  
! 		runSQL(session, "create table " + fixIdentifierCase(session, integerDataTableName) + " ( myid integer)"
! 			+ pageSizeClause);
  
  		int count = 0;
  		while (count++ < 11)
  		{
! 			runSQL(session, "insert into " + fixIdentifierCase(session, integerDataTableName) + " values ("
! 				+ count + ")");
  		}
  
! 		runSQL(session, "CREATE TABLE " + fixIdentifierCase(session, "a") + "( "
! 			+ "   acol int NOT NULL PRIMARY KEY, " + "   adesc varchar(10), " + "   bdesc varchar(10),"
! 			+ "   joined varchar(20) " + ") ");
  
! 		runSQL(session, "INSERT INTO " + fixIdentifierCase(session, "a")
  			+ " (acol,adesc,bdesc,joined) VALUES (1,'a1','b1','a1b1') ");
  
! 		runSQL(session, "INSERT INTO " + fixIdentifierCase(session, "a")
  			+ " (acol,adesc,bdesc,joined) VALUES (2,'a2','b2','a2b2') ");
  
! 		runSQL(session, "INSERT INTO " + fixIdentifierCase(session, "a")
  			+ " (acol,adesc,bdesc,joined) VALUES (3,'a3','b3','a3b3') ");
  
  		if (dialect.supportsAlterColumnNull())
  		{
! 			runSQL(session, "create table " + fixIdentifierCase(session, pkTestTableName) + " ( "
! 				+ primaryKeyTestColumnOne + " integer, " + primaryKeyTestColumnTwo + " integer )"
! 				+ pageSizeClause);
  		}
  
! 		runSQL(session, "create table " + fixIdentifierCase(session, testInsertIntoTable) + " ( myid integer)"
! 			+ pageSizeClause);
! 
! 		runSQL(session, "create table " + fixIdentifierCase(session, testFirstMergeTable)
! 			+ " ( myid integer, desc_t1 varchar(20))" + pageSizeClause);
  
! 		runSQL(session, "INSERT INTO " + fixIdentifierCase(session, testFirstMergeTable)
! 			+ " (myid, desc_t1) VALUES (1,'table1-row1') ");
! 		runSQL(session, "INSERT INTO " + fixIdentifierCase(session, testFirstMergeTable)
! 			+ " (myid, desc_t1) VALUES (2,'table1-row2') ");
! 		runSQL(session, "INSERT INTO " + fixIdentifierCase(session, testFirstMergeTable)
! 			+ " (myid, desc_t1) VALUES (3,'table1-row3') ");
  
! 		runSQL(session, "create table " + fixIdentifierCase(session, testSecondMergeTable)
! 			+ " ( myid integer, desc_t2 varchar(20))" + pageSizeClause);
  
! 		runSQL(session, "INSERT INTO " + fixIdentifierCase(session, testSecondMergeTable)
! 			+ " (myid, desc_t2) VALUES (1,'table2-row1') ");
! 		runSQL(session, "INSERT INTO " + fixIdentifierCase(session, testSecondMergeTable)
! 			+ " (myid, desc_t2) VALUES (2,'table2-row2') ");
! 		runSQL(session, "INSERT INTO " + fixIdentifierCase(session, testSecondMergeTable)
! 			+ " (myid, desc_t2) VALUES (3,'table2-row3') ");
  
! 		runSQL(session, "create table " + fixIdentifierCase(session, testTableForDropView)
! 			+ " ( myid integer, mydesc varchar(20))" + pageSizeClause);
  
! 		runSQL(session, "create table " + fixIdentifierCase(session, testTableForGetViewDefinition)
  			+ " ( myid integer, mydesc varchar(20))" + pageSizeClause);
  
--- 881,932 ----
  			+ " char(10), " + secondUniqueColumnName + " char(10))" + pageSizeClause);
  
! 		runSQL(session, "create table " + autoIncrementTableName + " ( " + autoIncrementColumnName
! 			+ " integer)" + pageSizeClause);
  
! 		runSQL(session, "create table " + integerDataTableName + " ( myid integer)" + pageSizeClause);
  
  		int count = 0;
  		while (count++ < 11)
  		{
! 			runSQL(session, "insert into " + integerDataTableName + " values (" + count + ")");
  		}
  
! 		runSQL(session, "CREATE TABLE " + testTableATableName + "( " + "   acol int NOT NULL PRIMARY KEY, "
! 			+ "   adesc varchar(10), " + "   bdesc varchar(10)," + "   joined varchar(20) " + ") ");
  
! 		runSQL(session, "INSERT INTO " + testTableATableName
  			+ " (acol,adesc,bdesc,joined) VALUES (1,'a1','b1','a1b1') ");
  
! 		runSQL(session, "INSERT INTO " + testTableATableName
  			+ " (acol,adesc,bdesc,joined) VALUES (2,'a2','b2','a2b2') ");
  
! 		runSQL(session, "INSERT INTO " + testTableATableName
  			+ " (acol,adesc,bdesc,joined) VALUES (3,'a3','b3','a3b3') ");
  
  		if (dialect.supportsAlterColumnNull())
  		{
! 			runSQL(session, "create table " + pkTestTableName + " ( " + primaryKeyTestColumnOne + " integer, "
! 				+ primaryKeyTestColumnTwo + " integer )" + pageSizeClause);
  		}
  
! 		runSQL(session, "create table " + testInsertIntoTable + " ( myid integer)" + pageSizeClause);
  
! 		runSQL(session, "create table " + testFirstMergeTable + " ( myid integer, desc_t1 varchar(20))"
! 			+ pageSizeClause);
  
! 		runSQL(session, "INSERT INTO " + testFirstMergeTable + " (myid, desc_t1) VALUES (1,'table1-row1') ");
! 		runSQL(session, "INSERT INTO " + testFirstMergeTable + " (myid, desc_t1) VALUES (2,'table1-row2') ");
! 		runSQL(session, "INSERT INTO " + testFirstMergeTable + " (myid, desc_t1) VALUES (3,'table1-row3') ");
  
! 		runSQL(session, "create table " + testSecondMergeTable + " ( myid integer, desc_t2 varchar(20))"
! 			+ pageSizeClause);
! 		runSQL(session, "INSERT INTO " + testSecondMergeTable + " (myid, desc_t2) VALUES (1,'table2-row1') ");
! 		runSQL(session, "INSERT INTO " + testSecondMergeTable + " (myid, desc_t2) VALUES (2,'table2-row2') ");
! 		runSQL(session, "INSERT INTO " + testSecondMergeTable + " (myid, desc_t2) VALUES (3,'table2-row3') ");
  
! 		runSQL(session, "create table " + testTableForDropView + " ( myid integer, mydesc varchar(20))"
! 			+ pageSizeClause);
  
! 		runSQL(session, "create table " + testTableForGetViewDefinition
  			+ " ( myid integer, mydesc varchar(20))" + pageSizeClause);
  
***************
*** 1063,1067 ****
  		final HibernateDialect dialect = getDialect(session);
  
! 		final String dropMatViewSql = "DROP MATERIALIZED VIEW MATVIEW ";
  
  		try
--- 1074,1078 ----
  		final HibernateDialect dialect = getDialect(session);
  
! 		final String dropMatViewSql = "DROP MATERIALIZED VIEW " + testMaterializedViewName;
  
  		try
***************
*** 1076,1081 ****
  		testAddPrimaryKey(session, new TableColumnInfo[] { pkCol });
  		final String createMatViewSQL =
! 			"CREATE MATERIALIZED VIEW MATVIEW " + "       REFRESH COMPLETE " + "   NEXT  SYSDATE + 1 "
! 				+ "   WITH PRIMARY KEY " + "   AS SELECT * FROM TEST ";
  		runSQL(session, createMatViewSQL);
  		final MockSession msession = (MockSession) session;
--- 1087,1092 ----
  		testAddPrimaryKey(session, new TableColumnInfo[] { pkCol });
  		final String createMatViewSQL =
! 			"CREATE MATERIALIZED VIEW " + testMaterializedViewName + " REFRESH COMPLETE NEXT SYSDATE + 1 "
! 				+ " WITH PRIMARY KEY AS SELECT * FROM TEST ";
  		runSQL(session, createMatViewSQL);
  		final MockSession msession = (MockSession) session;
***************
*** 1083,1087 ****
  		final String schema = msession.getDefaultSchema();
  		final SQLDatabaseMetaData md = session.getSQLConnection().getSQLMetaData();
! 		final ITableInfo info = new TableInfo(cat, schema, "MATVIEW", "TABLE", "", md);
  		final List<String> dropSQL = dialect.getTableDropSQL(info, true, true, qualifier, prefs);
  		runSQL(session, dropSQL);
--- 1094,1098 ----
  		final String schema = msession.getDefaultSchema();
  		final SQLDatabaseMetaData md = session.getSQLConnection().getSQLMetaData();
! 		final ITableInfo info = new TableInfo(cat, schema, testMaterializedViewName, "TABLE", "", md);
  		final List<String> dropSQL = dialect.getTableDropSQL(info, true, true, qualifier, prefs);
  		runSQL(session, dropSQL);
***************
*** 1093,1098 ****
  
  		final TableColumnInfo newNameCol =
! 			getVarcharColumn(fixIdentifierCase(session, "newNameCol"), testTableZeroTableName, true, null,
! 				"A column to be renamed");
  
  		final AlterColumnNameSqlExtractor extractor = new AlterColumnNameSqlExtractor(renameCol, newNameCol);
--- 1104,1108 ----
  
  		final TableColumnInfo newNameCol =
! 			getVarcharColumn(newNameColumeName, testTableZeroTableName, true, null, "A column to be renamed");
  
  		final AlterColumnNameSqlExtractor extractor = new AlterColumnNameSqlExtractor(renameCol, newNameCol);
***************
*** 1162,1166 ****
  		 */
  		final TableColumnInfo thirdColLonger =
! 			getVarcharColumn(nullVarcharColumnName, fixIdentifierCase(session, "test3"), true, "defVal",
  				"A varchar comment", 30);
  
--- 1172,1176 ----
  		 */
  		final TableColumnInfo thirdColLonger =
! 			getVarcharColumn(nullVarcharColumnName, testTableThreeTableName, true, "defVal",
  				"A varchar comment", 30);
  
***************
*** 1233,1239 ****
  	{
  		final HibernateDialect dialect = getDialect(session);
- 		final String tableName = fixIdentifierCase(session, "test3");
  		final TableColumnInfo notNullThirdCol =
! 			getVarcharColumn(fixIdentifierCase(session, "nullvc"), tableName, false, "defVal",
  				"A varchar comment");
  
--- 1243,1248 ----
  	{
  		final HibernateDialect dialect = getDialect(session);
  		final TableColumnInfo notNullThirdCol =
! 			getVarcharColumn(nullVarcharColumnName, testTableThreeTableName, false, "defVal",
  				"A varchar comment");
  
***************
*** 1472,1497 ****
  		if (!dialect.supportsCreateTable()) { return; }
  
! 		final String testTableName = "TESTDEFAULT";
! 
! 		dropTable(session, testTableName);
  
  		/* create a table with a default value to use as the model */
! 		final String createSql = "create table " + testTableName + " ( mycol integer default 0 )";
  
  		runSQL(session, createSql);
  
  		/* Build the sql statement(s) to create the table */
! 		ITableInfo tableInfo = getTableInfo(session, testTableName);
  		if (tableInfo == null)
  		{
! 			tableInfo = getTableInfo(session, testTableName.toLowerCase());
  		}
  		if (tableInfo == null)
  		{
! 			tableInfo = getTableInfo(session, testTableName.toUpperCase());
  		}
  
! 		assertNotNull("Couldn't locate table (" + testTableName + ") that was just created with statement ("
! 			+ createSql + ").  Dialect=" + dialect.getDisplayName(), tableInfo);
  
  		final CreateScriptPreferences prefs = new CreateScriptPreferences();
--- 1481,1505 ----
  		if (!dialect.supportsCreateTable()) { return; }
  
! 		dropTable(session, testDefaultTableName);
  
  		/* create a table with a default value to use as the model */
! 		final String createSql = "create table " + testDefaultTableName + " ( mycol integer default 0 )";
  
  		runSQL(session, createSql);
  
  		/* Build the sql statement(s) to create the table */
! 		ITableInfo tableInfo = getTableInfo(session, testDefaultTableName);
  		if (tableInfo == null)
  		{
! 			tableInfo = getTableInfo(session, testDefaultTableName.toLowerCase());
  		}
  		if (tableInfo == null)
  		{
! 			tableInfo = getTableInfo(session, testDefaultTableName.toUpperCase());
  		}
  
! 		assertNotNull(
! 			"Couldn't locate table (" + testDefaultTableName + ") that was just created with statement ("
! 				+ createSql + ").  Dialect=" + dialect.getDisplayName(), tableInfo);
  
  		final CreateScriptPreferences prefs = new CreateScriptPreferences();
***************
*** 1697,1704 ****
  	{
  		final HibernateDialect dialect = getDialect(session);
- 		final String tableName = fixIdentifierCase(session, testTableForDropView);
- 		final String viewName = fixIdentifierCase(session, testViewToBeDropped);
  
! 		final DropViewSqlExtractor dropViewSqlExtractor = new DropViewSqlExtractor(viewName, false);
  		if (dialectDiscoveryMode)
  		{
--- 1705,1710 ----
  	{
  		final HibernateDialect dialect = getDialect(session);
  
! 		final DropViewSqlExtractor dropViewSqlExtractor = new DropViewSqlExtractor(testViewToBeDropped, false);
  		if (dialectDiscoveryMode)
  		{
***************
*** 1711,1718 ****
  
  			String sql =
! 				dialect.getCreateViewSQL(viewName, "select * from " + tableName, null, qualifier, prefs);
  			runSQL(session, sql);
  
! 			sql = dialect.getDropViewSQL(viewName, false, qualifier, prefs);
  
  			runSQL(session, new String[] { sql }, dropViewSqlExtractor);
--- 1717,1725 ----
  
  			String sql =
! 				dialect.getCreateViewSQL(testViewToBeDropped, "select * from " + testTableForDropView, null,
! 					qualifier, prefs);
  			runSQL(session, sql);
  
! 			sql = dialect.getDropViewSQL(testViewToBeDropped, false, qualifier, prefs);
  
  			runSQL(session, new String[] { sql }, dropViewSqlExtractor);
***************
*** 1724,1728 ****
  				try
  				{
! 					dialect.getDropViewSQL(viewName, false, qualifier, prefs);
  					failDialect(dialect, "dropping a view");
  				}
--- 1731,1735 ----
  				try
  				{
! 					dialect.getDropViewSQL(testViewToBeDropped, false, qualifier, prefs);
  					failDialect(dialect, "dropping a view");
  				}
***************
*** 1739,1746 ****
  	{
  		final HibernateDialect dialect = getDialect(session);
- 		final String tableName = fixIdentifierCase(session, testTableForGetViewDefinition);
- 		final String viewName = fixIdentifierCase(session, testViewToBeDropped);
  
! 		final GetViewdefinitionSqlExtractor extractor = new GetViewdefinitionSqlExtractor(viewName);
  		if (dialectDiscoveryMode)
  		{
--- 1746,1751 ----
  	{
  		final HibernateDialect dialect = getDialect(session);
  
! 		final GetViewdefinitionSqlExtractor extractor = new GetViewdefinitionSqlExtractor(testViewToBeDropped);
  		if (dialectDiscoveryMode)
  		{
***************
*** 1753,1757 ****
  			/* create a test view that we will get view def for then drop and re-create */
  			final String createViewSql =
! 				dialect.getCreateViewSQL(viewName, "select * from " + tableName, null, qualifier, prefs);
  			runSQL(session, createViewSql);
  
--- 1758,1763 ----
  			/* create a test view that we will get view def for then drop and re-create */
  			final String createViewSql =
! 				dialect.getCreateViewSQL(testViewToBeDropped, "select * from " + testTableForGetViewDefinition,
! 					null, qualifier, prefs);
  			runSQL(session, createViewSql);
  
***************
*** 1760,1764 ****
  			 * This should exclude the "CREATE VIEW <viewname> AS" prefix and just return the query.
  			 */
! 			final String viewDefSql = dialect.getViewDefinitionSQL(viewName, qualifier, prefs);
  			final ResultSet rs = runQuery(session, viewDefSql);
  			String viewBody = "";
--- 1766,1770 ----
  			 * This should exclude the "CREATE VIEW <viewname> AS" prefix and just return the query.
  			 */
! 			final String viewDefSql = dialect.getViewDefinitionSQL(testViewToBeDropped, qualifier, prefs);
  			final ResultSet rs = runQuery(session, viewDefSql);
  			String viewBody = "";
***************
*** 1778,1782 ****
  			 * (that is, it's query part minus the "CREATE VIEW AS" prefix), we can drop the view. 
  			 */
! 			final String dropViewSql = dialect.getDropViewSQL(viewName, false, qualifier, prefs);
  			runSQL(session, new String[] { dropViewSql }, extractor);
  
--- 1784,1788 ----
  			 * (that is, it's query part minus the "CREATE VIEW AS" prefix), we can drop the view. 
  			 */
! 			final String dropViewSql = dialect.getDropViewSQL(testViewToBeDropped, false, qualifier, prefs);
  			runSQL(session, new String[] { dropViewSql }, extractor);
  
***************
*** 1786,1790 ****
  			try
  			{
! 				dialect.getViewDefinitionSQL(viewName, qualifier, prefs);
  				failDialect(dialect, "getting the view definition");
  			}
--- 1792,1796 ----
  			try
  			{
! 				dialect.getViewDefinitionSQL(testViewToBeDropped, qualifier, prefs);
  				failDialect(dialect, "getting the view definition");
  			}
***************
*** 1807,1811 ****
  		final String indexName1 = "testIndex";
  		final String indexName2 = "testUniqueIndex";
- 		final String tableName = fixIdentifierCase(session, testCreateIndexTable);
  
  		if (dialect.supportsCreateIndex() && dialect.supportsDropIndex())
--- 1813,1816 ----
***************
*** 1842,1851 ****
  				columns = new String[] { indexTestColumnName };
  				String sql =
! 					dialect.getCreateIndexSQL(indexName1, tableName, accessMethod, columns, false, tablespace,
! 						constraints, qualifier, prefs);
  
  				final CreateIndexSqlExtractor extractor =
! 					new CreateIndexSqlExtractor(indexName1, tableName, accessMethod, columns, false, tablespace,
! 						constraints);
  
  				// create it.
--- 1847,1856 ----
  				columns = new String[] { indexTestColumnName };
  				String sql =
! 					dialect.getCreateIndexSQL(indexName1, testCreateIndexTable, accessMethod, columns, false,
! 						tablespace, constraints, qualifier, prefs);
  
  				final CreateIndexSqlExtractor extractor =
! 					new CreateIndexSqlExtractor(indexName1, testCreateIndexTable, accessMethod, columns, false,
! 						tablespace, constraints);
  
  				// create it.
***************
*** 1855,1864 ****
  				columns = new String[] { uniqueIndexTestColumnName };
  				sql =
! 					dialect.getCreateIndexSQL(indexName2, tableName, accessMethod, columns, true, tablespace,
! 						constraints, qualifier, prefs);
  
  				final CreateIndexSqlExtractor extractor2 =
! 					new CreateIndexSqlExtractor(indexName2, tableName, accessMethod, columns, true, tablespace,
! 						constraints);
  
  				// create it.
--- 1860,1869 ----
  				columns = new String[] { uniqueIndexTestColumnName };
  				sql =
! 					dialect.getCreateIndexSQL(indexName2, testCreateIndexTable, accessMethod, columns, true,
! 						tablespace, constraints, qualifier, prefs);
  
  				final CreateIndexSqlExtractor extractor2 =
! 					new CreateIndexSqlExtractor(indexName2, testCreateIndexTable, accessMethod, columns, true,
! 						tablespace, constraints);
  
  				// create it.
***************
*** 1866,1870 ****
  
  				// now drop the second.
! 				String dropIndexSQL = dialect.getDropIndexSQL(tableName, indexName2, true, qualifier, prefs);
  
  				// TODO: Remove this when Frontbase bug gets fixed.
--- 1871,1876 ----
  
  				// now drop the second.
! 				String dropIndexSQL =
! 					dialect.getDropIndexSQL(testCreateIndexTable, indexName2, true, qualifier, prefs);
  
  				// TODO: Remove this when Frontbase bug gets fixed.
***************
*** 1873,1882 ****
  				if (!DialectFactory.isFrontBase(session.getMetaData()))
  				{
! 					runSQL(session, new String[] { dropIndexSQL }, new DropIndexSqlExtractor(tableName,
  						indexName2, true));
  				}
  
  				// now drop the first
! 				dropIndexSQL = dialect.getDropIndexSQL(tableName, indexName1, true, qualifier, prefs);
  				try
  				{
--- 1879,1888 ----
  				if (!DialectFactory.isFrontBase(session.getMetaData()))
  				{
! 					runSQL(session, new String[] { dropIndexSQL }, new DropIndexSqlExtractor(testCreateIndexTable,
  						indexName2, true));
  				}
  
  				// now drop the first
! 				dropIndexSQL = dialect.getDropIndexSQL(testCreateIndexTable, indexName1, true, qualifier, prefs);
  				try
  				{
***************
*** 1896,1900 ****
  				try
  				{
! 					dialect.getCreateIndexSQL(indexName1, tableName, null, columns, false, tablespace,
  						constraints, qualifier, prefs);
  					failDialect(dialect, "for creating an index");
--- 1902,1906 ----
  				try
  				{
! 					dialect.getCreateIndexSQL(indexName1, testCreateIndexTable, null, columns, false, tablespace,
  						constraints, qualifier, prefs);
  					failDialect(dialect, "for creating an index");
***************
*** 1910,1914 ****
  				try
  				{
! 					dialect.getDropIndexSQL(tableName, indexName1, false, qualifier, prefs);
  					failDialect(dialect, "for dropping an index");
  				}
--- 1916,1920 ----
  				try
  				{
! 					dialect.getDropIndexSQL(testCreateIndexTable, indexName1, false, qualifier, prefs);
  					failDialect(dialect, "for dropping an index");
  				}
***************
*** 2164,2168 ****
  		final HibernateDialect dialect = getDialect(session);
  		TableColumnInfo[] columns = new TableColumnInfo[] { uniqueConstraintTableColumnInfo };
- 		// final String tableName = fixIdentifierCase(session, testUniqueConstraintTableName);
  
  		final AddUniqueConstraintSqlExtractor extractor =
--- 2170,2173 ----
***************
*** 2277,2283 ****
  	{
  		final HibernateDialect dialect = getDialect(session);
! 		String valuesPart = "select distinct myid from " + fixIdentifierCase(session, integerDataTableName);
  		final ArrayList<String> columns = new ArrayList<String>();
! 		final String tableName = fixIdentifierCase(session, testInsertIntoTable);
  
  		final InsertIntoSqlExtractor insertIntoSqlExtractor =
--- 2282,2288 ----
  	{
  		final HibernateDialect dialect = getDialect(session);
! 		String valuesPart = "select distinct myid from " + integerDataTableName;
  		final ArrayList<String> columns = new ArrayList<String>();
! 		final String tableName = testInsertIntoTable;
  
  		final InsertIntoSqlExtractor insertIntoSqlExtractor =
***************
*** 2348,2352 ****
  	{
  		final HibernateDialect dialect = getDialect(session);
! 		final String tableName = "a";
  		final String[] setColumns = new String[] { "joined" };
  		final String[] setValues = new String[] { "'a1b1'" };
--- 2353,2357 ----
  	{
  		final HibernateDialect dialect = getDialect(session);
! 		final String tableName = testTableATableName;
  		final String[] setColumns = new String[] { "joined" };
  		final String[] setValues = new String[] { "'a1b1'" };
***************
*** 2398,2403 ****
  
  			selectedTables[0] =
! 				new DatabaseObjectInfoHelper(catalog, schema, fixIdentifierCase(session, testSecondMergeTable),
! 					fixIdentifierCase(session, testSecondMergeTable), DatabaseObjectType.TABLE);
  
  			final MergeTableCommandHelper command = new MergeTableCommandHelper(session, selectedTables, null);
--- 2403,2408 ----
  
  			selectedTables[0] =
! 				new DatabaseObjectInfoHelper(catalog, schema, testSecondMergeTable, testSecondMergeTable,
! 					DatabaseObjectType.TABLE);
  
  			final MergeTableCommandHelper command = new MergeTableCommandHelper(session, selectedTables, null);
***************
*** 2416,2433 ****
  		if (DialectFactory.isAxion(session.getMetaData())) { return; }
  
- 		final String tableName = fixIdentifierCase(session, testTimestampTable);
  		final String timestampTypeName = dialect.getTypeName(Types.TIMESTAMP, 5, 5, 5);
  
  		final CreateDataScriptHelper command = new CreateDataScriptHelper(session, null, false);
  
! 		dropTable(session, tableName);
! 		runSQL(session, "create table " + tableName + " ( mytime " + timestampTypeName + " )");
  
! 		String scale = findMaximumTimestampScale(session, tableName);
  
  		System.out.println("(" + dialect.getDisplayName() + ") max scale is : " + scale + "(" + scale.length()
  			+ ")");
  
! 		runSQL(session, "insert into " + tableName + " values ({ts '2008-02-21 21:26:23." + scale + "'})");
  
  		// if (dialect.supportsSubSecondTimestamps())
--- 2421,2438 ----
  		if (DialectFactory.isAxion(session.getMetaData())) { return; }
  
  		final String timestampTypeName = dialect.getTypeName(Types.TIMESTAMP, 5, 5, 5);
  
  		final CreateDataScriptHelper command = new CreateDataScriptHelper(session, null, false);
  
! 		dropTable(session, testTimestampTable);
! 		runSQL(session, "create table " + testTimestampTable + " ( mytime " + timestampTypeName + " )");
  
! 		String scale = findMaximumTimestampScale(session, testTimestampTable);
  
  		System.out.println("(" + dialect.getDisplayName() + ") max scale is : " + scale + "(" + scale.length()
  			+ ")");
  
! 		runSQL(session, "insert into " + testTimestampTable + " values ({ts '2008-02-21 21:26:23." + scale
! 			+ "'})");
  
  		// if (dialect.supportsSubSecondTimestamps())
***************
*** 2440,2448 ****
  		// }
  
! 		final StringBuffer sb = command.getSQL(tableName);
  
! 		final String newTableName = fixIdentifierCase(session, testNewTimestampTable);
! 		dropTable(session, newTableName);
! 		runSQL(session, "create table " + newTableName + " ( mytime " + timestampTypeName + " )");
  		runSQL(session, sb.toString());
  
--- 2445,2452 ----
  		// }
  
! 		final StringBuffer sb = command.getSQL(testTimestampTable);
  
! 		dropTable(session, testNewTimestampTable);
! 		runSQL(session, "create table " + testNewTimestampTable + " ( mytime " + timestampTypeName + " )");
  		runSQL(session, sb.toString());
  
***************
*** 2450,2454 ****
  		if (dialect.supportsSubSecondTimestamps())
  		{
! 			final ResultSet rs = runQuery(session, "select mytime from " + newTableName);
  			if (rs.next())
  			{
--- 2454,2458 ----
  		if (dialect.supportsSubSecondTimestamps())
  		{
! 			final ResultSet rs = runQuery(session, "select mytime from " + testNewTimestampTable);
  			if (rs.next())
  			{
***************
*** 2922,2936 ****
  			final Vector<String> mergeColumns = new Vector<String>();
  			mergeColumns.add("desc_t1");
! 			final String referencedTable = fixIdentifierCase(session, testFirstMergeTable);
  			final Vector<String[]> whereDataColumns = new Vector<String[]>();
  			whereDataColumns.add(new String[] { "myid", "myid" });
  			final boolean _isMergeData = true;
  			super.customDialog =
! 				new MergeTableDialogHelper(mergeColumns, referencedTable, whereDataColumns, _isMergeData);
  			_allTables = new HashMap<String, TableColumnInfo[]>();
! 			_allTables.put(fixIdentifierCase(session, testFirstMergeTable), getLiveColumnInfo(session,
! 				fixIdentifierCase(session, testFirstMergeTable)));
! 			_allTables.put(fixIdentifierCase(session, testSecondMergeTable), getLiveColumnInfo(session,
! 				fixIdentifierCase(session, testSecondMergeTable)));
  			super._dialect = DialectFactory.getDialect(session.getMetaData());
  		}
--- 2926,2938 ----
  			final Vector<String> mergeColumns = new Vector<String>();
  			mergeColumns.add("desc_t1");
! 
  			final Vector<String[]> whereDataColumns = new Vector<String[]>();
  			whereDataColumns.add(new String[] { "myid", "myid" });
  			final boolean _isMergeData = true;
  			super.customDialog =
! 				new MergeTableDialogHelper(mergeColumns, testFirstMergeTable, whereDataColumns, _isMergeData);
  			_allTables = new HashMap<String, TableColumnInfo[]>();
! 			_allTables.put(testFirstMergeTable, getLiveColumnInfo(session, testFirstMergeTable));
! 			_allTables.put(testSecondMergeTable, getLiveColumnInfo(session, testSecondMergeTable));
  			super._dialect = DialectFactory.getDialect(session.getMetaData());
  		}

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/exp NetezzaSequenceParentExtractorImpl.java, NONE, 1.1 NetezzaSequenceInodeExpanderFactory.java, NONE, 1.1

[Rob M. <man...@us...>]

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-serv30775/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/exp

Added Files:
	NetezzaSequenceParentExtractorImpl.java 
	NetezzaSequenceInodeExpanderFactory.java 
Log Message:
New plugin for Netezza NPS 4.6 rdbms.

--- NEW FILE: NetezzaSequenceInodeExpanderFactory.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.client.session.mainpanel.objecttree.expanders.SequenceParentExpander;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;

public class NetezzaSequenceInodeExpanderFactory 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)
	{
		SequenceParentExpander result = new SequenceParentExpander();
		result.setExtractor(new NetezzaSequenceParentExtractorImpl());
		return result;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.INodeExpanderFactory#getParentLabelForType(net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType)
	 */
	public String getParentLabelForType(DatabaseObjectType type)
	{
		return "SEQUENCE";
	}

}

--- NEW FILE: NetezzaSequenceParentExtractorImpl.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 java.sql.PreparedStatement;
import java.sql.SQLException;

import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.ISequenceParentExtractor;
import net.sourceforge.squirrel_sql.client.session.schemainfo.ObjFilterMatcher;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;

public class NetezzaSequenceParentExtractorImpl implements ISequenceParentExtractor
{
	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()
	{
		return SQL;
	}

	@Override
	public void bindParameters(PreparedStatement pstmt, IDatabaseObjectInfo parentDbinfo,
		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());
	}

}

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/prefs NetezzaPreferenceBean.java, NONE, 1.1

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/prefs
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30775/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/prefs

Added Files:
	NetezzaPreferenceBean.java 
Log Message:
New plugin for Netezza NPS 4.6 rdbms.

--- NEW FILE: NetezzaPreferenceBean.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.prefs;

import java.io.Serializable;

import net.sourceforge.squirrel_sql.fw.preferences.BaseQueryTokenizerPreferenceBean;

public class NetezzaPreferenceBean extends BaseQueryTokenizerPreferenceBean implements Cloneable, Serializable
{
	private static final long serialVersionUID = 8799498411960415923L;

	public NetezzaPreferenceBean() {
		super();
		statementSeparator = ";";
		procedureSeparator = "ENDPROC";
		lineComment = "--";
		removeMultiLineComments = false;
		installCustomQueryTokenizer = true;
	}


}

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tab ViewSourceTab.java, NONE, 1.1 ProcedureSourceTab.java, NONE, 1.1

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tab
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30775/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/tab

Added Files:
	ViewSourceTab.java ProcedureSourceTab.java 
Log Message:
New plugin for Netezza NPS 4.6 rdbms.

--- NEW FILE: ProcedureSourceTab.java ---
package net.sourceforge.squirrel_sql.plugins.netezza.tab;

/*
 * 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 net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;

/**
 * This class provides the necessary information to the parent tab to display the source for a Netezza 
 * procedure.
 */
public class ProcedureSourceTab extends FormattedSourceTab
{
	/**
	 * Constructor
	 * 
	 * @param hint
	 *           what the user sees on mouse-over tool-tip
	 * @param stmtSep
	 *           the string to use to separate SQL statements
	 */
	public ProcedureSourceTab(String hint, String stmtSep)
	{
		super(hint);
		super.setupFormatter(stmtSep, null);
		super.setCompressWhitespace(true);
		// Netezza procedure definitions include the statement separator.
		super.appendSeparator = false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement()
	 */
	@Override
	protected String getSqlStatement()
	{
		return 
		"SELECT " +
		"'create or replace procedure ' || proceduresignature || ' returns ' || returns || " +
		"' LANGUAGE NZPLSQL AS BEGIN_PROC ' || proceduresource || ' END_PROC;' " +
		"FROM _v_procedure " +
		"WHERE owner = ? " +
		"and procedure = ? ";
	}

	/**
    * Overridden as the super implementation binds schemaname rather than catalogname as is used
    * in Netezza.
    * 
    * @return a String array of bind variable values
    */
	@Override
   protected String[] getBindValues()
   {
   	final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
   	return new String[] { doi.getSchemaName(), doi.getSimpleName() };		
   }

	/**
	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab#processResult(java.lang.StringBuilder)
	 */
	@Override
	protected String processResult(StringBuilder buf)
	{
		return buf.toString().replace("/n", "\\n");
	}
	
}

--- NEW FILE: ViewSourceTab.java ---
package net.sourceforge.squirrel_sql.plugins.netezza.tab;

/*
 * 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 net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.FormattedSourceTab;
import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;

/**
 * This class provides the necessary information to the parent tab to display the source for a Netezza view.
 */
public class ViewSourceTab extends FormattedSourceTab
{
	/**
	 * Constructor
	 * 
	 * @param hint
	 *           what the user sees on mouse-over tool-tip
	 * @param stmtSep
	 *           the string to use to separate SQL statements
	 */
	public ViewSourceTab(String hint, String stmtSep)
	{
		super(hint);
		super.setupFormatter(stmtSep, null);
		super.setCompressWhitespace(true);
		// Netezza view definitions include the statement separator.
		super.appendSeparator = false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.table.PSFormattedSourceTab#getSqlStatement()
	 */
	@Override
	protected String getSqlStatement()
	{
		return 
		"SELECT 'create or replace view ' || v.VIEWNAME || ' as ' || " +
		"v.definition FROM _v_view v, _v_objs_owned o " +
		"where v.objid = o.objid " +
		"and o.DATABASE = ? " +
		"and v.VIEWNAME = ? ";	
	}

	/**
    * Overridden as the super implementation binds schemaname rather than catalogname as is used
    * in Netezza.
    * 
    * @return a String array of bind variable values
    */
	@Override
   protected String[] getBindValues()
   {
   	final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
   	return new String[] { doi.getCatalogName(), doi.getSimpleName() };		
   }
	
}

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza I18NStrings.properties, NONE, 1.1 NetezzaPlugin.java, NONE, 1.1

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30775/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza

Added Files:
	I18NStrings.properties NetezzaPlugin.java 
Log Message:
New plugin for Netezza NPS 4.6 rdbms.

--- NEW FILE: I18NStrings.properties ---



NetezzaPlugin.viewSourceTabHint=Shows the source of the selected view

NetezzaPlugin.prefsHint=Preferences for Netezza
--- NEW FILE: NetezzaPlugin.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;

import net.sourceforge.squirrel_sql.client.plugin.DefaultSessionPlugin;
import net.sourceforge.squirrel_sql.client.plugin.PluginException;
import net.sourceforge.squirrel_sql.client.plugin.PluginQueryTokenizerPreferencesManager;
import net.sourceforge.squirrel_sql.client.plugin.PluginSessionCallback;
import net.sourceforge.squirrel_sql.client.plugin.gui.PluginGlobalPreferencesTab;
import net.sourceforge.squirrel_sql.client.plugin.gui.PluginQueryTokenizerPreferencesPanel;
import net.sourceforge.squirrel_sql.client.preferences.IGlobalPreferencesPanel;
import net.sourceforge.squirrel_sql.client.session.IObjectTreeAPI;
import net.sourceforge.squirrel_sql.client.session.ISession;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.expanders.SchemaExpander;
import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.DatabaseObjectInfoTab;
import net.sourceforge.squirrel_sql.fw.dialects.DialectFactory;
import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.plugins.netezza.exp.NetezzaSequenceInodeExpanderFactory;
import net.sourceforge.squirrel_sql.plugins.netezza.prefs.NetezzaPreferenceBean;
import net.sourceforge.squirrel_sql.plugins.netezza.tab.ProcedureSourceTab;
import net.sourceforge.squirrel_sql.plugins.netezza.tab.ViewSourceTab;

/**
 * The main controller class for the Netezza plugin.
 */
public class NetezzaPlugin extends DefaultSessionPlugin
{

	/**
	 * Internationalized strings for this class.
	 */
	private static final StringManager s_stringMgr =
		StringManagerFactory.getStringManager(NetezzaPlugin.class);

	/** manages our query tokenizing preferences */
	private PluginQueryTokenizerPreferencesManager _prefsManager = null;	
	
	static interface i18n
	{
		// i18n[NetezzaPlugin.viewSourceTabHint=Shows the source of the selected view]
		String VIEW_SOURCE_TAB_HINT = s_stringMgr.getString("NetezzaPlugin.viewSourceTabHint");
		
		// i18n[NetezzaPlugin.prefsHint=Preferences for Netezza]
		String PREFS_HINT = s_stringMgr.getString("NetezzaPlugin.prefsHint");
		
	}

	@Override
	public String getAuthor()
	{
		return "Rob Manning";
	}

	@Override
	public String getDescriptiveName()
	{
		return "Netezza Plugin";
	}

	@Override
	public String getInternalName()
	{
		return "netezza";
	}

	@Override
	public String getVersion()
	{
		return "0.01";
	}

	@Override
	public boolean allowsSessionStartedInBackground()
	{
		return true;
	}

	@Override
	protected boolean isPluginSession(ISession session)
	{
		return DialectFactory.isNetezza(session.getMetaData());
	}

	/**
	 * Create panel for the Global Properties dialog.
	 * 
	 * @return properties panel.
	 */
	public IGlobalPreferencesPanel[] getGlobalPreferencePanels()
	{
		PluginQueryTokenizerPreferencesPanel _prefsPanel =
			new PluginQueryTokenizerPreferencesPanel(_prefsManager, "Netezza");

		PluginGlobalPreferencesTab tab = new PluginGlobalPreferencesTab(_prefsPanel);

		tab.setHint(i18n.PREFS_HINT);
		tab.setTitle("Netezza");

		return new IGlobalPreferencesPanel[] { tab };
	}
	
	
	@Override
	public PluginSessionCallback sessionStarted(final ISession session)
	{
		if (!DialectFactory.isNetezza(session.getMetaData())) {
			return null;
		}
		GUIUtils.processOnSwingEventThread(new Runnable() {

			@Override
			public void run()
			{
				updateObjectTree(session.getObjectTreeAPIOfActiveSessionWindow());
			}
			
		});
		
		return null;
	}

	private void updateObjectTree(final IObjectTreeAPI objTree)
	{
		objTree.addDetailTab(DatabaseObjectType.PROCEDURE, new DatabaseObjectInfoTab());
		objTree.addDetailTab(DatabaseObjectType.PROCEDURE, new ProcedureSourceTab(i18n.VIEW_SOURCE_TAB_HINT, ";"));
		objTree.addDetailTab(DatabaseObjectType.SEQUENCE, new DatabaseObjectInfoTab());
		objTree.addDetailTab(DatabaseObjectType.VIEW, new DatabaseObjectInfoTab());
		objTree.addDetailTab(DatabaseObjectType.VIEW, new ViewSourceTab(i18n.VIEW_SOURCE_TAB_HINT, ";"));
		
		
		// ////// Object Tree Expanders ////////
		// Schema Expanders - sequence
		objTree.addExpander(DatabaseObjectType.SCHEMA, 
			new SchemaExpander(new NetezzaSequenceInodeExpanderFactory(), DatabaseObjectType.SEQUENCE));
				
	}

	/**
	 * @see net.sourceforge.squirrel_sql.client.plugin.DefaultPlugin#initialize()
	 */
	@Override
	public void initialize() throws PluginException
	{
		_prefsManager = new PluginQueryTokenizerPreferencesManager();
		_prefsManager.initialize(this, new NetezzaPreferenceBean());
	}

}

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins - New directory

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30704/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins

Log Message:
Directory /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins added to the repository

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza - New directory

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30704/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza

Log Message:
Directory /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza added to the repository

[Squirrel-sql-commits] sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/exp - New directory

[Rob M. <man...@us...>]

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-serv30704/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/exp

Log Message:
Directory /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net/sourceforge/squirrel_sql/plugins/netezza/exp added to the repository

[Squirrel-sql-commits] sql12/plugins/netezza/src/net - New directory

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv30704/plugins/netezza/src/net

Log Message:
Directory /cvsroot/squirrel-sql/sql12/plugins/netezza/src/net added to the repository