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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/expanders SequenceParentExpander.java, 1.1, 1.2

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

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

Modified Files:
	SequenceParentExpander.java 
Log Message:
Add debug logging to log the query used for sequence parent expanding.


Index: SequenceParentExpander.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/expanders/SequenceParentExpander.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SequenceParentExpander.java	16 Feb 2009 22:52:45 -0000	1.1
--- SequenceParentExpander.java	25 Dec 2009 03:01:35 -0000	1.2
***************
*** 35,38 ****
--- 35,40 ----
  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;
  
  /**
***************
*** 47,50 ****
--- 49,54 ----
  {
  
+ 	private final static ILogger s_log = LoggerController.createLogger(SequenceParentExpander.class);
+ 		
  	/**
  	 * The database-specific class that provides the query for "finding" sequences in a schema/catalog.
***************
*** 90,97 ****
  		final ObjFilterMatcher filterMatcher = new ObjFilterMatcher(session.getProperties());
  
! 		final PreparedStatement pstmt = conn.prepareStatement(extractor.getSequenceParentQuery());
  		ResultSet rs = null;
  		try
  		{
  			extractor.bindParameters(pstmt, parentDbinfo, filterMatcher);
  
--- 94,108 ----
  		final ObjFilterMatcher filterMatcher = new ObjFilterMatcher(session.getProperties());
  
! 		final String sequenceParentQuerySql = extractor.getSequenceParentQuery();
! 		if (s_log.isDebugEnabled()) {
! 			s_log.debug("createChildren: running sequence parent query for sequence children: "
! 				+ sequenceParentQuerySql);
! 		}
! 
! 		PreparedStatement pstmt = null;
  		ResultSet rs = null;
  		try
  		{
+ 			pstmt = conn.prepareStatement(sequenceParentQuerySql);		
  			extractor.bindParameters(pstmt, parentDbinfo, filterMatcher);
  

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

[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-serv30208/app/src/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs

Modified Files:
	FormattedSourceTab.java 
Log Message:
New API method to allow subclasses to work with what is returned from the database just prior to formatting the result.

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.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FormattedSourceTab.java	15 Dec 2009 23:13:05 -0000	1.8
--- FormattedSourceTab.java	25 Dec 2009 03:00:47 -0000	1.9
***************
*** 1,3 ****
--- 1,4 ----
  package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs;
+ 
  /*
   * Copyright (C) 2007 Rob Manning
***************
*** 37,259 ****
  
  /**
!  * This will provide source code formatting for object source to subclasses.  
!  * The subclass only needs to call setupFormatter if code reformatting is 
!  * desired and whether or not to compressWhitespace, which is on by default.
!  * Without calling setupFormatter, word-wrapping on word boundaries is still 
!  * performed and whitespace is compressed, if so configured.
   * 
   * @author manningr
   */
! public abstract class FormattedSourceTab extends BaseSourceTab {
  
!     /** Logger for this class. */
!     private final static ILogger s_log = LoggerController
!             .createLogger(FormattedSourceTab.class);
  
!     private static final StringManager s_stringMgr =
!         StringManagerFactory.getStringManager(FormattedSourceTab.class);
!     
!     /** does the work of formatting */
!     private CodeReformator formatter = null;
  
!     /** whether or not to compress whitespace */
!     private boolean compressWhitespace = true;
  
!     private CommentSpec[] commentSpecs =
!         new CommentSpec[]
!         {
!             new CommentSpec("/*", "*/"),
!             new CommentSpec("--", "\n")
!         };
!     
!     /** The String to use to separate statements */
!     protected String statementSeparator = null;
!     
!     /** Whether or not to appendSeparator before reformatting */
!     protected boolean appendSeparator = true;
!     
!     static interface i18n {
!         //i18n[FormatterSourceTab.noSourceAvailable=No object source code is 
!         //available]
!         String NO_SOURCE_AVAILABLE = 
!             s_stringMgr.getString("FormatterSourceTab.noSourceAvailable");
!     }
!     
!     public FormattedSourceTab(String hint) {
!         super(hint);
!         super.setSourcePanel(new FormattedSourcePanel());
!     }
  
!     /**
!      * Sets up the formatter which formats 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 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(String stmtSep, CommentSpec[] commentSpecs) {
!         if (commentSpecs != null) {
!             this.commentSpecs = commentSpecs;
!         }
!         statementSeparator = stmtSep;
!         formatter = new CodeReformator(stmtSep, this.commentSpecs);
!     }
  
!     /**
!      * Whether or not to convert multiple consecutive spaces into a single
!      * space.
!      * 
!      * @param compressWhitespace
!      */
!     protected void setCompressWhitespace(boolean compressWhitespace) {
!         this.compressWhitespace = compressWhitespace;
!     }
  
!     /**
!      * The panel that displays the formatted source code.
!      */
!     private final class FormattedSourcePanel extends BaseSourcePanel {
!         private static final long serialVersionUID = 1L;
  
!         private JTextArea _ta;
  
!         FormattedSourcePanel() {
!             super(new BorderLayout());
!             _ta = new JTextArea();
!             _ta.setEditable(false);
!             add(_ta, BorderLayout.CENTER);
!         }
  
!         public void load(ISession session, PreparedStatement stmt) {
!             _ta.setText("");
  
!             // always wrap on word boundaries
!             _ta.setWrapStyleWord(true);
  
!             ResultSet rs = null;
!             try {
!                 rs = stmt.executeQuery();
!                 StringBuffer buf = new StringBuffer(4096);
!                 while (rs.next()) {
!                     String line = rs.getString(1);
!                     if (line == null) {
!                         s_log.debug("load: Null object source line; skipping...");
!                         continue;
!                     }
!                     if (compressWhitespace) {
!                         buf.append(line.trim() + " ");
!                     } else {
!                         buf.append(line);
!                     }
!                 }
!                 if (appendSeparator) {
!                     buf.append("\n");
!                     buf.append(statementSeparator);
!                 }
!                 if (formatter != null && buf.length() != 0) {
!                     if (s_log.isDebugEnabled()) {
!                         s_log.debug("Object source code before formatting: "
!                                 + buf.toString());
!                     }
!                     _ta.setText(format(buf.toString()));
!                 } else {
!                     if (buf.length() == 0) {
!                         buf.append(i18n.NO_SOURCE_AVAILABLE);
!                     }
!                     _ta.setText(buf.toString());
!                 }
!                 _ta.setCaretPosition(0);
  
!             } catch (Exception ex) {
!                 if (s_log.isDebugEnabled()) {
!                     s_log.debug("Unexpected exception while formatting " +
!                                 "object source code", ex);
!                 }
!                 session.showErrorMessage(ex);
!             } finally {
!                 SQLUtilities.closeResultSet(rs);
!             }
!         }
!     }
  
!     /**
!      * We trap any IllegalStateException from the formatter here.  If the SQL
!      * source code fails to format, log it and show the original unformatted
!      * version.
!      * 
!      * @param toFormat the SQL to format.
!      * 
!      * @return either formatted or original version of the specified SQL.
!      */
!     private String format(String toFormat) {
!         String result = toFormat;
!         try {
!             result = formatter.reformat(toFormat);
!         } catch (IllegalStateException e) {
!             s_log.error("format: Formatting SQL failed: "+e.getMessage(), e);
!         }
!         return result;
!     }
  
  	/**
!     * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createStatement()
!     */
!    @Override
!    protected PreparedStatement createStatement() throws SQLException
!    {
!    	final ISession session = getSession();
!    
!    	ISQLConnection conn = session.getSQLConnection();
!    	
!    	String sqlStatement = getSqlStatement();
!    	String[] bindValues  = getBindValues();
!    	
!    	if (s_log.isDebugEnabled())
!    	{
!    		s_log.debug("Running SQL for index source tab: " + sqlStatement);
!    		s_log.debug("With the following bind variable values: ");
!    		int parameterIndex = 1;
!    		for (String bindValue : bindValues) {
!    			s_log.debug("["+(parameterIndex++)+"] => '"+bindValue+"'");
!    		}
!    	}
!    	PreparedStatement pstmt = conn.prepareStatement(sqlStatement);
!    
!    	int parameterIndex = 1;
!    	for (String bindValue : bindValues) {
!    		pstmt.setString(parameterIndex++, bindValue);
!    	}
!    	
!    	return pstmt;
!    }
  
  	/**
!     * Subclasses must override to provide the SQL necessary to select the source for the selected 
!     * DatabaseObjectInfo.  Note: the default implementation of getBindValues provides values for schema and 
!     * object simple name.  Therefore, it is advantageous if the where clause in the select statement 
!     * returned from this method specify first the schema, and then the object name and no more bind variables.  
!     * If this is possible, then it isn't necessary for subclasses to override getBindValues.   
!     * 
!     * @return an SQL select statement with embedded bind variables (?'s). 
!     */
!    protected abstract String getSqlStatement();
  
  	/**
!     * This method simply returns a String array containing the schema name and the selected object's simple
!     * name, in that order.  If the SQL returned from getSqlStatement must specify a different order, or for
!     * example uses that catalog of the object, instead of or in addition to schema, then this method must be
!     * overridden to return the necessary bind variable values, in the order required by the SQL statement.
!     * 
!     * @return a String array of bind variable values
!     */
!    protected String[] getBindValues()
!    {
!    	final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
!    	return new String[] { doi.getSchemaName(), doi.getSimpleName() };		
!    }
  }
--- 38,294 ----
  
  /**
!  * This will provide source code formatting for object source to subclasses. The subclass only needs to call
!  * setupFormatter if code reformatting is desired and whether or not to compressWhitespace, which is on by
!  * default. Without calling setupFormatter, word-wrapping on word boundaries is still performed and whitespace
!  * is compressed, if so configured.
   * 
   * @author manningr
   */
! public abstract class FormattedSourceTab extends BaseSourceTab
! {
  
! 	/** Logger for this class. */
! 	private final static ILogger s_log = LoggerController.createLogger(FormattedSourceTab.class);
  
! 	private static final StringManager s_stringMgr =
! 		StringManagerFactory.getStringManager(FormattedSourceTab.class);
  
! 	/** does the work of formatting */
! 	private CodeReformator formatter = null;
  
! 	/** whether or not to compress whitespace */
! 	private boolean compressWhitespace = true;
  
! 	private CommentSpec[] commentSpecs =
! 		new CommentSpec[] { new CommentSpec("/*", "*/"), new CommentSpec("--", "\n") };
  
! 	/** The String to use to separate statements */
! 	protected String statementSeparator = null;
  
! 	/** Whether or not to appendSeparator before reformatting */
! 	protected boolean appendSeparator = true;
  
! 	static interface i18n
! 	{
! 		// i18n[FormatterSourceTab.noSourceAvailable=No object source code is
! 		// available]
! 		String NO_SOURCE_AVAILABLE = s_stringMgr.getString("FormatterSourceTab.noSourceAvailable");
! 	}
  
! 	public FormattedSourceTab(String hint)
! 	{
! 		super(hint);
! 		super.setSourcePanel(new FormattedSourcePanel());
! 	}
  
! 	/**
! 	 * Sets up the formatter which formats 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 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(String stmtSep, CommentSpec[] commentSpecs)
! 	{
! 		if (commentSpecs != null)
! 		{
! 			this.commentSpecs = commentSpecs;
! 		}
! 		statementSeparator = stmtSep;
! 		formatter = new CodeReformator(stmtSep, this.commentSpecs);
! 	}
  
! 	/**
! 	 * Whether or not to convert multiple consecutive spaces into a single space.
! 	 * 
! 	 * @param compressWhitespace
! 	 */
! 	protected void setCompressWhitespace(boolean compressWhitespace)
! 	{
! 		this.compressWhitespace = compressWhitespace;
! 	}
  
! 	/**
! 	 * The panel that displays the formatted source code.
! 	 */
! 	private final class FormattedSourcePanel extends BaseSourcePanel
! 	{
! 		private static final long serialVersionUID = 1L;
  
! 		private JTextArea _ta;
  
! 		FormattedSourcePanel()
! 		{
! 			super(new BorderLayout());
! 			_ta = new JTextArea();
! 			_ta.setEditable(false);
! 			add(_ta, BorderLayout.CENTER);
! 		}
! 
! 		public void load(ISession session, PreparedStatement stmt)
! 		{
! 			_ta.setText("");
! 
! 			// always wrap on word boundaries
! 			_ta.setWrapStyleWord(true);
! 
! 			ResultSet rs = null;
! 			try
! 			{
! 				rs = stmt.executeQuery();
! 				StringBuilder buf = new StringBuilder(4096);
! 				while (rs.next())
! 				{
! 					String line = rs.getString(1);
! 					if (line == null)
! 					{
! 						s_log.debug("load: Null object source line; skipping...");
! 						continue;
! 					}
! 					if (compressWhitespace)
! 					{
! 						buf.append(line.trim() + " ");
! 					}
! 					else
! 					{
! 						buf.append(line);
! 					}
! 				}
! 				if (appendSeparator)
! 				{
! 					buf.append("\n");
! 					buf.append(statementSeparator);
! 				}
! 				String processedResult = processResult(buf);
! 				if (formatter != null && buf.length() != 0)
! 				{
! 					if (s_log.isDebugEnabled())
! 					{
! 						s_log.debug("Object source code before formatting: " + processedResult);
! 					}
! 					_ta.setText(format(processedResult));
! 				}
! 				else
! 				{
! 					if (buf.length() == 0)
! 					{
! 						buf.append(i18n.NO_SOURCE_AVAILABLE);
! 					}
! 					_ta.setText(processedResult);
! 				}
! 				_ta.setCaretPosition(0);
! 
! 			}
! 			catch (Exception ex)
! 			{
! 				if (s_log.isDebugEnabled())
! 				{
! 					s_log.debug("Unexpected exception while formatting " + "object source code", ex);
! 				}
! 				session.showErrorMessage(ex);
! 			}
! 			finally
! 			{
! 				SQLUtilities.closeResultSet(rs);
! 			}
! 		}
! 
! 	}
  
  	/**
! 	 * This method can be overridden by subclasses if further processing of the result from the query needs to
! 	 * happen prior to formatting.  By default, no processing is done - the StringBuilder is simply converted
! 	 * to a string by calling it's toString method.
! 	 * 
! 	 * @param buf the StringBuilder that can be procesed.
! 	 * @return the processed String.
! 	 */
! 	protected String processResult(final StringBuilder buf)
! 	{
! 		return buf.toString();
! 	}
  
  	/**
! 	 * We trap any IllegalStateException from the formatter here. If the SQL source code fails to format, log
! 	 * it and show the original unformatted version.
! 	 * 
! 	 * @param toFormat
! 	 *           the SQL to format.
! 	 * @return either formatted or original version of the specified SQL.
! 	 */
! 	private String format(String toFormat)
! 	{
! 		String result = toFormat;
! 		try
! 		{
! 			result = formatter.reformat(toFormat);
! 		}
! 		catch (IllegalStateException e)
! 		{
! 			s_log.error("format: Formatting SQL failed: " + e.getMessage(), e);
! 		}
! 		return result;
! 	}
  
  	/**
! 	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab#createStatement()
! 	 */
! 	@Override
! 	protected PreparedStatement createStatement() throws SQLException
! 	{
! 		final ISession session = getSession();
! 
! 		ISQLConnection conn = session.getSQLConnection();
! 
! 		String sqlStatement = getSqlStatement();
! 		String[] bindValues = getBindValues();
! 
! 		if (s_log.isDebugEnabled())
! 		{
! 			s_log.debug("Running SQL for index source tab: " + sqlStatement);
! 			s_log.debug("With the following bind variable values: ");
! 			int parameterIndex = 1;
! 			for (String bindValue : bindValues)
! 			{
! 				s_log.debug("[" + (parameterIndex++) + "] => '" + bindValue + "'");
! 			}
! 		}
! 		PreparedStatement pstmt = conn.prepareStatement(sqlStatement);
! 
! 		int parameterIndex = 1;
! 		for (String bindValue : bindValues)
! 		{
! 			pstmt.setString(parameterIndex++, bindValue);
! 		}
! 
! 		return pstmt;
! 	}
! 
! 	/**
! 	 * Subclasses must override to provide the SQL necessary to select the source for the selected
! 	 * DatabaseObjectInfo. Note: the default implementation of getBindValues provides values for schema and
! 	 * object simple name. Therefore, it is advantageous if the where clause in the select statement returned
! 	 * from this method specify first the schema, and then the object name and no more bind variables. If this
! 	 * is possible, then it isn't necessary for subclasses to override getBindValues.
! 	 * 
! 	 * @return an SQL select statement with embedded bind variables (?'s).
! 	 */
! 	protected abstract String getSqlStatement();
! 
! 	/**
! 	 * This method simply returns a String array containing the schema name and the selected object's simple
! 	 * name, in that order. If the SQL returned from getSqlStatement must specify a different order, or for
! 	 * example uses that catalog of the object, instead of or in addition to schema, then this method must be
! 	 * overridden to return the necessary bind variable values, in the order required by the SQL statement.
! 	 * 
! 	 * @return a String array of bind variable values
! 	 */
! 	protected String[] getBindValues()
! 	{
! 		final IDatabaseObjectInfo doi = getDatabaseObjectInfo();
! 		return new String[] { doi.getSchemaName(), doi.getSimpleName() };
! 	}
  }

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

[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-serv29685/fw/src/net/sourceforge/squirrel_sql/fw/sql

Modified Files:
	SQLDatabaseMetaData.java 
Log Message:
Adjustments to work around bugs in Netezza JDBC driver.

Index: SQLDatabaseMetaData.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/SQLDatabaseMetaData.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** SQLDatabaseMetaData.java	15 Jun 2009 09:56:08 -0000	1.60
--- SQLDatabaseMetaData.java	25 Dec 2009 02:59:28 -0000	1.61
***************
*** 418,421 ****
--- 418,426 ----
  			value = Boolean.TRUE;
  		}
+ 		else if (DialectFactory.isNetezza(this)) 
+ 		{
+ 		// Netezza driver mistakenly reports that it doesn't support stored procedures.
+ 			value = Boolean.TRUE;
+ 		}
  		else
  		{
***************
*** 918,921 ****
--- 923,933 ----
  				tableTypes.add("VIEW");				
  			}
+ 		} 
+ 		
+ 		else if (DialectFactory.getDialectType(this) == DialectType.NETEZZA) {
+ 			tableTypes.clear();
+ 			tableTypes.add("SYSTEM TABLE");
+ 			tableTypes.add("TABLE");
+ 			tableTypes.add("VIEW");
  		}
  		

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects NetezzaDialextExt.java, NONE, 1.1 DialectType.java, 1.2, 1.3 DialectFactory.java, 1.14, 1.15

[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-serv29519/fw/src/net/sourceforge/squirrel_sql/fw/dialects

Modified Files:
	DialectType.java DialectFactory.java 
Added Files:
	NetezzaDialextExt.java 
Log Message:
New (incomplete) dialect for Netezza NPS v4.6 rdbms.

Index: DialectFactory.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DialectFactory.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DialectFactory.java	22 Sep 2008 10:02:55 -0000	1.14
--- DialectFactory.java	25 Dec 2009 02:58:30 -0000	1.15
***************
*** 38,325 ****
  
  /**
!  * This class maps SQLDatabaseMetaData instances to their corresponding 
!  * Hibernate dialect.  
   */
! public class DialectFactory {
  
!     /** this is used to indicate that the sesion is being copied from */
!     public static final int SOURCE_TYPE = 0;
!     
!     /** this is used to indicate that the sesion is being copied to */
!     public static final int DEST_TYPE = 1;
!     
!     /** Logger for this class. */
!     private final static ILogger s_log = 
!         LoggerController.createLogger(DialectFactory.class);  
!     
!     private static final AxionDialectExt axionDialect = new AxionDialectExt();
!     
!     private static final DB2DialectExt db2Dialect = new DB2DialectExt();
!     
!     // TODO: subclass these hibernate dialects to provide the "canPasteTo" 
!     //       api method in HibernateDialect interface.
!     //private static final DB2390Dialect db2390Dialect = new DB2390Dialect();
!     
!     //private static final DB2400Dialect db2400Dialect = new DB2400Dialect();
!     
!     private static final DaffodilDialectExt daffodilDialect = new DaffodilDialectExt();
!     
!     private static final DerbyDialectExt derbyDialect = new DerbyDialectExt();
!     
!     private static final FirebirdDialectExt firebirdDialect = new FirebirdDialectExt();
!     
!     private static final FrontBaseDialectExt frontbaseDialect = new FrontBaseDialectExt();
!     
!     private static final GenericDialectExt genericDialect = new GenericDialectExt();
!     
!     private static final HADBDialectExt hadbDialect = new HADBDialectExt();
!     
!     private static final H2DialectExt h2Dialect = new H2DialectExt();
!     
!     private static final HSQLDialectExt hsqlDialect = new HSQLDialectExt();
!     
!     private static final InformixDialectExt informixDialect = new InformixDialectExt();
!     
!     private static final InterbaseDialectExt interbaseDialect = new InterbaseDialectExt();
!     
!     private static final IngresDialectExt ingresDialect = new IngresDialectExt();
!     
!     private static final MAXDBDialectExt maxDbDialect = new MAXDBDialectExt();
!     
!     private static final McKoiDialectExt mckoiDialect = new McKoiDialectExt();
!     
!     private static final MySQLDialectExt mysqlDialect = new MySQLDialectExt();
!     
!     private static final MySQL5DialectExt mysql5Dialect = new MySQL5DialectExt();    
!     
!     private static final OracleDialectExt oracle9iDialect = new OracleDialectExt();
!     
!     private static final PointbaseDialectExt pointbaseDialect = 
!                                                          new PointbaseDialectExt();
!     
!     private static final PostgreSQLDialectExt postgreSQLDialect = 
!                                                         new PostgreSQLDialectExt();
  
!     private static final ProgressDialectExt progressDialect = new ProgressDialectExt();
!     
!     private static final SybaseDialectExt sybaseDialect = new SybaseDialectExt();
!     
!     private static final SQLServerDialectExt sqlserverDialect = new SQLServerDialectExt();
!     
!     private static final TimesTenDialectExt timestenDialect = new TimesTenDialectExt();
  
!     private static final IntersystemsCacheDialectExt  intersystemsCacheDialectExt = new IntersystemsCacheDialectExt();
  
!     private static HashMap<String, HibernateDialect> dbNameDialectMap = 
!         new HashMap<String, HibernateDialect>();
!     
!     public static boolean isPromptForDialect = false; 
!     
!     /** Internationalized strings for this class. */
!     private static final StringManager s_stringMgr =
!                   StringManagerFactory.getStringManager(DialectFactory.class);
!     
!     private static IDialogUtils dialogUtils = new DialogUtils();
!     public static void setDialogUtils(IDialogUtils dialogUtils) {
!    	 DialectFactory.dialogUtils = dialogUtils;
!     }
!     
!     /** 
!      * The keys to dbNameDialectMap are displayed to the user in the dialect
!      * chooser widget, so be sure to use something that is intelligable to 
!      * an end user 
!      */
!     static {
!         dbNameDialectMap.put(axionDialect.getDisplayName(), axionDialect);
!         dbNameDialectMap.put(db2Dialect.getDisplayName(), db2Dialect);
!         //dbNameDialectMap.put("DB2/390", db2390Dialect);
!         //dbNameDialectMap.put("DB2/400", db2400Dialect);
!         dbNameDialectMap.put(daffodilDialect.getDisplayName(), daffodilDialect);
!         dbNameDialectMap.put(derbyDialect.getDisplayName(), derbyDialect);
!         dbNameDialectMap.put(firebirdDialect.getDisplayName(), firebirdDialect);
!         dbNameDialectMap.put(frontbaseDialect.getDisplayName(), frontbaseDialect);
!         dbNameDialectMap.put(hadbDialect.getDisplayName(), hadbDialect);
!         dbNameDialectMap.put(hsqlDialect.getDisplayName(), hsqlDialect);
!         dbNameDialectMap.put(h2Dialect.getDisplayName(), h2Dialect);
!         dbNameDialectMap.put(informixDialect.getDisplayName(), informixDialect);
!         dbNameDialectMap.put(ingresDialect.getDisplayName(), ingresDialect);
!         dbNameDialectMap.put(interbaseDialect.getDisplayName(), interbaseDialect);
!         dbNameDialectMap.put(maxDbDialect.getDisplayName(), maxDbDialect);
!         dbNameDialectMap.put(mckoiDialect.getDisplayName(), mckoiDialect);
!         dbNameDialectMap.put(sqlserverDialect.getDisplayName(), sqlserverDialect);
!         dbNameDialectMap.put(mysqlDialect.getDisplayName(), mysqlDialect);
!         dbNameDialectMap.put(oracle9iDialect.getDisplayName(), oracle9iDialect);
!         dbNameDialectMap.put(pointbaseDialect.getDisplayName(), pointbaseDialect);
!         dbNameDialectMap.put(postgreSQLDialect.getDisplayName(), postgreSQLDialect);
!         dbNameDialectMap.put(progressDialect.getDisplayName(), progressDialect);
!         dbNameDialectMap.put(sybaseDialect.getDisplayName(), sybaseDialect);
!         dbNameDialectMap.put(timestenDialect.getDisplayName(), timestenDialect);
!         dbNameDialectMap.put(intersystemsCacheDialectExt.getDisplayName(), intersystemsCacheDialectExt);
!     }
!     
!     public static boolean isAxion(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, axionDialect);
!     }
!     
!     public static boolean isDaffodil(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, daffodilDialect);
!     }
!     
!     public static boolean isDB2(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, db2Dialect);
!     }
  
!     public static boolean isDerby(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, derbyDialect);
!     }    
!     
!     public static boolean isFirebird(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, firebirdDialect);
!     }
!     
!     public static boolean isFrontBase(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, frontbaseDialect);
!     }
  
!     public static boolean isHADB(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, hadbDialect);
!     }    
!     
!     public static boolean isH2(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, h2Dialect);
!     }
!     
!     public static boolean isHSQL(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, hsqlDialect);
!     }    
  
!     public static boolean isInformix(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, informixDialect);
!     }    
!     
!     public static boolean isIngres(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, ingresDialect);
!     }
  
!     public static boolean isInterbase(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, interbaseDialect);
!     }
!     
!     public static boolean isMaxDB(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, maxDbDialect);
!     }
!     
!     public static boolean isMcKoi(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, mckoiDialect);        
!     }
  
!     public static boolean isMSSQLServer(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, sqlserverDialect);
!     }            
!     
!     public static boolean isMySQL(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, mysqlDialect);
!     }        
  
!     public static boolean isMySQL5(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, mysql5Dialect);
!     }        
!     
!     public static boolean isOracle(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, oracle9iDialect);        
!     }
!     
!     public static boolean isPointbase(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, pointbaseDialect);        
!     }
  
!     public static boolean isPostgreSQL(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, postgreSQLDialect);        
!     }    
!     
!     public static boolean isProgress(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, progressDialect);        
!     }
!     
!     public static boolean isSyBase(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, sybaseDialect);        
!     }
!     
!     public static boolean isTimesTen(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, timestenDialect);            	
!     }
!     
!     public static boolean isIntersystemsCacheDialectExt(ISQLDatabaseMetaData md) {
!         return dialectSupportsProduct(md, intersystemsCacheDialectExt);
!     }
  
!     /**
!      * Returns a DialectType for the specified ISQLDatabaseMetaData
!      * 
!      * @param md the metadata to use to determine the dialect type
!      * 
!      * @return a dialect type 
!      */
!     public static DialectType getDialectType(ISQLDatabaseMetaData md) {
!        HibernateDialect dialect = getDialect(md);
!        return dialect.getDialectType();
!     }
!     
!     /**
!      * Examines the driver class name from the specified session to see if it
!      * begins with any of the space-delimited string tokens in the specified 
!      * nameToMatch.
!      *  
!      * @param session the ISession to check
!      * @param nameToMatch a space-delimited string of driver class package 
!      *                    prefixes 
!      * @return true if there is a match of any string in the nameToMatch and 
!      *              the ISession's driver class name; false otherwise.
!      */
!     private static boolean dialectSupportsProduct(ISQLDatabaseMetaData data, 
!     											  HibernateDialect dialect) 
!     {
!         boolean result = false;
!         if (data != null && dialect != null) {
!         	try {
!         		String productName = data.getDatabaseProductName();
!         		String productVersion = data.getDatabaseProductVersion();
!         		result = dialect.supportsProduct(productName, productVersion);
!         	} catch (Exception e) {
!         		s_log.error(
!         		    "Encountered unexpected exception while attempting to " +
!         		    "determine database product name/version: "+e.getMessage());
!         		if (s_log.isDebugEnabled()) {
!         			StringWriter s = new StringWriter();
!         			PrintWriter p = new PrintWriter(s);
!         			e.printStackTrace(p);
!         			s_log.debug(s.getBuffer().toString());
!         		}
!         	}
!         }
!         return result;
!     }
!             
!     public static HibernateDialect getDialect(String dbName) {
!         return dbNameDialectMap.get(dbName);
!     }
!     
!     public static HibernateDialect getDialectIgnoreCase(String dbName) {
!    	 for (String displayName : dbNameDialectMap.keySet()) {
!    		 if (displayName.toLowerCase().equals(dbName.toLowerCase())) {
!    			 return dbNameDialectMap.get(displayName);
!    		 }
!    	 }
!    	 return null;
!     }
!     
!     /**
!      * 
!      * @param md
!      * @return
!      */
!     public static HibernateDialect getDialect(ISQLDatabaseMetaData md) 
!     {
!       if (isAxion(md)) { return axionDialect; }
  		if (isDaffodil(md)) { return daffodilDialect; }
  		if (isDB2(md)) { return db2Dialect; }
--- 38,361 ----
  
  /**
!  * This class maps SQLDatabaseMetaData instances to their corresponding Hibernate dialect.
   */
! public class DialectFactory
! {
  
! 	/** this is used to indicate that the sesion is being copied from */
! 	public static final int SOURCE_TYPE = 0;
  
! 	/** this is used to indicate that the sesion is being copied to */
! 	public static final int DEST_TYPE = 1;
  
! 	/** Logger for this class. */
! 	private final static ILogger s_log = LoggerController.createLogger(DialectFactory.class);
  
! 	private static final AxionDialectExt axionDialect = new AxionDialectExt();
  
! 	private static final DB2DialectExt db2Dialect = new DB2DialectExt();
  
! 	// TODO: subclass these hibernate dialects to provide the "canPasteTo"
! 	// api method in HibernateDialect interface.
! 	// private static final DB2390Dialect db2390Dialect = new DB2390Dialect();
  
! 	// private static final DB2400Dialect db2400Dialect = new DB2400Dialect();
  
! 	private static final DaffodilDialectExt daffodilDialect = new DaffodilDialectExt();
  
! 	private static final DerbyDialectExt derbyDialect = new DerbyDialectExt();
  
! 	private static final FirebirdDialectExt firebirdDialect = new FirebirdDialectExt();
  
! 	private static final FrontBaseDialectExt frontbaseDialect = new FrontBaseDialectExt();
  
! 	private static final GenericDialectExt genericDialect = new GenericDialectExt();
! 
! 	private static final HADBDialectExt hadbDialect = new HADBDialectExt();
! 
! 	private static final H2DialectExt h2Dialect = new H2DialectExt();
! 
! 	private static final HSQLDialectExt hsqlDialect = new HSQLDialectExt();
! 
! 	private static final InformixDialectExt informixDialect = new InformixDialectExt();
! 
! 	private static final InterbaseDialectExt interbaseDialect = new InterbaseDialectExt();
! 
! 	private static final IngresDialectExt ingresDialect = new IngresDialectExt();
! 
! 	private static final MAXDBDialectExt maxDbDialect = new MAXDBDialectExt();
! 
! 	private static final McKoiDialectExt mckoiDialect = new McKoiDialectExt();
! 
! 	private static final MySQLDialectExt mysqlDialect = new MySQLDialectExt();
! 
! 	private static final MySQL5DialectExt mysql5Dialect = new MySQL5DialectExt();
! 
! 	private static final NetezzaDialextExt netezzaDialect = new NetezzaDialextExt();
! 	
! 	private static final OracleDialectExt oracle9iDialect = new OracleDialectExt();
! 
! 	private static final PointbaseDialectExt pointbaseDialect = new PointbaseDialectExt();
! 
! 	private static final PostgreSQLDialectExt postgreSQLDialect = new PostgreSQLDialectExt();
! 
! 	private static final ProgressDialectExt progressDialect = new ProgressDialectExt();
! 
! 	private static final SybaseDialectExt sybaseDialect = new SybaseDialectExt();
! 
! 	private static final SQLServerDialectExt sqlserverDialect = new SQLServerDialectExt();
! 
! 	private static final TimesTenDialectExt timestenDialect = new TimesTenDialectExt();
! 
! 	private static final IntersystemsCacheDialectExt intersystemsCacheDialectExt =
! 		new IntersystemsCacheDialectExt();
! 
! 	private static HashMap<String, HibernateDialect> dbNameDialectMap =
! 		new HashMap<String, HibernateDialect>();
! 
! 	public static boolean isPromptForDialect = false;
! 
! 	/** Internationalized strings for this class. */
! 	private static final StringManager s_stringMgr =
! 		StringManagerFactory.getStringManager(DialectFactory.class);
! 
! 	private static IDialogUtils dialogUtils = new DialogUtils();
! 
! 	public static void setDialogUtils(IDialogUtils dialogUtils)
! 	{
! 		DialectFactory.dialogUtils = dialogUtils;
! 	}
! 
! 	/**
! 	 * The keys to dbNameDialectMap are displayed to the user in the dialect chooser widget, so be sure to use
! 	 * something that is intelligable to an end user
! 	 */
! 	static
! 	{
! 		dbNameDialectMap.put(axionDialect.getDisplayName(), axionDialect);
! 		dbNameDialectMap.put(db2Dialect.getDisplayName(), db2Dialect);
! 		// dbNameDialectMap.put("DB2/390", db2390Dialect);
! 		// dbNameDialectMap.put("DB2/400", db2400Dialect);
! 		dbNameDialectMap.put(daffodilDialect.getDisplayName(), daffodilDialect);
! 		dbNameDialectMap.put(derbyDialect.getDisplayName(), derbyDialect);
! 		dbNameDialectMap.put(firebirdDialect.getDisplayName(), firebirdDialect);
! 		dbNameDialectMap.put(frontbaseDialect.getDisplayName(), frontbaseDialect);
! 		dbNameDialectMap.put(hadbDialect.getDisplayName(), hadbDialect);
! 		dbNameDialectMap.put(hsqlDialect.getDisplayName(), hsqlDialect);
! 		dbNameDialectMap.put(h2Dialect.getDisplayName(), h2Dialect);
! 		dbNameDialectMap.put(informixDialect.getDisplayName(), informixDialect);
! 		dbNameDialectMap.put(ingresDialect.getDisplayName(), ingresDialect);
! 		dbNameDialectMap.put(interbaseDialect.getDisplayName(), interbaseDialect);
! 		dbNameDialectMap.put(maxDbDialect.getDisplayName(), maxDbDialect);
! 		dbNameDialectMap.put(mckoiDialect.getDisplayName(), mckoiDialect);
! 		dbNameDialectMap.put(mysqlDialect.getDisplayName(), mysqlDialect);
! 		dbNameDialectMap.put(netezzaDialect.getDisplayName(), netezzaDialect);
! 		dbNameDialectMap.put(oracle9iDialect.getDisplayName(), oracle9iDialect);
! 		dbNameDialectMap.put(pointbaseDialect.getDisplayName(), pointbaseDialect);
! 		dbNameDialectMap.put(postgreSQLDialect.getDisplayName(), postgreSQLDialect);
! 		dbNameDialectMap.put(progressDialect.getDisplayName(), progressDialect);
! 		dbNameDialectMap.put(sqlserverDialect.getDisplayName(), sqlserverDialect);
! 		dbNameDialectMap.put(sybaseDialect.getDisplayName(), sybaseDialect);
! 		dbNameDialectMap.put(timestenDialect.getDisplayName(), timestenDialect);
! 		dbNameDialectMap.put(intersystemsCacheDialectExt.getDisplayName(), intersystemsCacheDialectExt);
! 	}
! 
! 	public static boolean isAxion(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, axionDialect);
! 	}
! 
! 	public static boolean isDaffodil(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, daffodilDialect);
! 	}
! 
! 	public static boolean isDB2(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, db2Dialect);
! 	}
! 
! 	public static boolean isDerby(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, derbyDialect);
! 	}
! 
! 	public static boolean isFirebird(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, firebirdDialect);
! 	}
! 
! 	public static boolean isFrontBase(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, frontbaseDialect);
! 	}
! 
! 	public static boolean isHADB(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, hadbDialect);
! 	}
! 
! 	public static boolean isH2(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, h2Dialect);
! 	}
! 
! 	public static boolean isHSQL(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, hsqlDialect);
! 	}
! 
! 	public static boolean isInformix(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, informixDialect);
! 	}
! 
! 	public static boolean isIngres(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, ingresDialect);
! 	}
! 
! 	public static boolean isInterbase(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, interbaseDialect);
! 	}
! 
! 	public static boolean isMaxDB(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, maxDbDialect);
! 	}
! 
! 	public static boolean isMcKoi(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, mckoiDialect);
! 	}
! 
! 	public static boolean isMSSQLServer(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, sqlserverDialect);
! 	}
! 
! 	public static boolean isMySQL(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, mysqlDialect);
! 	}
! 
! 	public static boolean isMySQL5(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, mysql5Dialect);
! 	}
! 
! 	public static boolean isNetezza(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, netezzaDialect);
! 	}
! 
! 	public static boolean isOracle(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, oracle9iDialect);
! 	}
! 
! 	public static boolean isPointbase(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, pointbaseDialect);
! 	}
! 
! 	public static boolean isPostgreSQL(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, postgreSQLDialect);
! 	}
! 
! 	public static boolean isProgress(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, progressDialect);
! 	}
! 
! 	public static boolean isSyBase(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, sybaseDialect);
! 	}
! 
! 	public static boolean isTimesTen(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, timestenDialect);
! 	}
! 
! 	public static boolean isIntersystemsCacheDialectExt(ISQLDatabaseMetaData md)
! 	{
! 		return dialectSupportsProduct(md, intersystemsCacheDialectExt);
! 	}
! 
! 	/**
! 	 * Returns a DialectType for the specified ISQLDatabaseMetaData
! 	 * 
! 	 * @param md
! 	 *           the metadata to use to determine the dialect type
! 	 * @return a dialect type
! 	 */
! 	public static DialectType getDialectType(ISQLDatabaseMetaData md)
! 	{
! 		HibernateDialect dialect = getDialect(md);
! 		return dialect.getDialectType();
! 	}
! 
! 	/**
! 	 * Examines the driver class name from the specified session to see if it begins with any of the
! 	 * space-delimited string tokens in the specified nameToMatch.
! 	 * 
! 	 * @param session
! 	 *           the ISession to check
! 	 * @param nameToMatch
! 	 *           a space-delimited string of driver class package prefixes
! 	 * @return true if there is a match of any string in the nameToMatch and the ISession's driver class name;
! 	 *         false otherwise.
! 	 */
! 	private static boolean dialectSupportsProduct(ISQLDatabaseMetaData data, HibernateDialect dialect)
! 	{
! 		boolean result = false;
! 		if (data != null && dialect != null)
! 		{
! 			try
! 			{
! 				String productName = data.getDatabaseProductName();
! 				String productVersion = data.getDatabaseProductVersion();
! 				result = dialect.supportsProduct(productName, productVersion);
! 			}
! 			catch (Exception e)
! 			{
! 				s_log.error("Encountered unexpected exception while attempting to "
! 					+ "determine database product name/version: " + e.getMessage());
! 				if (s_log.isDebugEnabled())
! 				{
! 					StringWriter s = new StringWriter();
! 					PrintWriter p = new PrintWriter(s);
! 					e.printStackTrace(p);
! 					s_log.debug(s.getBuffer().toString());
! 				}
! 			}
! 		}
! 		return result;
! 	}
! 
! 	public static HibernateDialect getDialect(String dbName)
! 	{
! 		return dbNameDialectMap.get(dbName);
! 	}
! 
! 	public static HibernateDialect getDialectIgnoreCase(String dbName)
! 	{
! 		for (String displayName : dbNameDialectMap.keySet())
! 		{
! 			if (displayName.toLowerCase().equals(dbName.toLowerCase())) { return dbNameDialectMap.get(displayName); }
! 		}
! 		return null;
! 	}
! 
! 	/**
! 	 * @param md
! 	 * @return
! 	 */
! 	public static HibernateDialect getDialect(ISQLDatabaseMetaData md)
! 	{
! 		if (isAxion(md)) { return axionDialect; }
  		if (isDaffodil(md)) { return daffodilDialect; }
  		if (isDB2(md)) { return db2Dialect; }
***************
*** 338,341 ****
--- 374,378 ----
  		if (isMySQL5(md)) { return mysql5Dialect; }
  		if (isMSSQLServer(md)) { return sqlserverDialect; }
+ 		if (isNetezza(md)) { return netezzaDialect; }
  		if (isOracle(md)) { return oracle9iDialect; }
  		if (isPointbase(md)) { return pointbaseDialect; }
***************
*** 345,368 ****
  		if (isTimesTen(md)) { return timestenDialect; }
  		if (isIntersystemsCacheDialectExt(md)) { return intersystemsCacheDialectExt; }
! 		// GenericDialect must be last, since it will claim that it supports any product/version.  That is also
  		// why there is no isGenericDialect - it would always return true if there was one, making it useless.
!       return genericDialect;  
!     }
!     
!     public static HibernateDialect getDialect(int sessionType,
!                                               JFrame parent, 
!                                               ISQLDatabaseMetaData md) 
!         throws UserCancelledOperationException 
!     {
!         HibernateDialect result = null;
!         
!         // User doesn't wish for us to try to auto-detect the dest db.
!         if (isPromptForDialect) {
!             result = showDialectDialog(parent, sessionType);
!         } else {
!             result = getDialect(md);
!         }
!         return result;
!     }
  
  	/**
--- 382,406 ----
  		if (isTimesTen(md)) { return timestenDialect; }
  		if (isIntersystemsCacheDialectExt(md)) { return intersystemsCacheDialectExt; }
! 		// GenericDialect must be last, since it will claim that it supports any product/version. That is also
  		// why there is no isGenericDialect - it would always return true if there was one, making it useless.
! 		return genericDialect;
! 	}
! 
! 	public static HibernateDialect getDialect(int sessionType, JFrame parent, ISQLDatabaseMetaData md)
! 		throws UserCancelledOperationException
! 	{
! 		HibernateDialect result = null;
! 
! 		// User doesn't wish for us to try to auto-detect the dest db.
! 		if (isPromptForDialect)
! 		{
! 			result = showDialectDialog(parent, sessionType);
! 		}
! 		else
! 		{
! 			result = getDialect(md);
! 		}
! 		return result;
! 	}
  
  	/**
***************
*** 379,434 ****
  	 * @return the dialect that the user picked.
  	 */
!     private static HibernateDialect showDialectDialog(JFrame parent,
!                                                       int sessionType) 
!         throws UserCancelledOperationException 
!     {
!         Object[] dbNames = getDbNames();
!         String chooserTitle = s_stringMgr.getString("dialectChooseTitle");
!         String typeStr = null;
!         if (sessionType == SOURCE_TYPE) {
!             typeStr = s_stringMgr.getString("sourceSessionTypeName");
!         }
!         if (sessionType == DEST_TYPE) {
!             typeStr = s_stringMgr.getString("destSessionTypeName");
!         }
!         String message = 
!             s_stringMgr.getString("dialectDetectFailedMessage", typeStr);
!         if (isPromptForDialect) {
!             message = s_stringMgr.getString("autoDetectDisabledMessage", typeStr);
!         } 
!         
!         String dbName =
  			dialogUtils.showInputDialog(parent, message, chooserTitle, JOptionPane.INFORMATION_MESSAGE, null,
  				dbNames, dbNames[0]);
!         
!         if (dbName == null || "".equals(dbName)) {
!             throw new UserCancelledOperationException();
!         }
!         return dbNameDialectMap.get(dbName);
!     }
!     
!     /**
!      * Returns a list of Database server names that can be preented to the 
!      * user whenever we want the user to pick a dialect.
!      * 
!      * @return
!      */
!     public static Object[] getDbNames() {
!         Set<String> keyset = dbNameDialectMap.keySet();
!         Object[] keys = keyset.toArray();
!         Arrays.sort(keys);
!         return keys;
!     }
!     
!     /**
!      * Returns an array of HibernateDialect instances, one for each supported 
!      * dialect.
!      * 
!      * @return
!      */
!     public static Object[] getSupportedDialects() {
!         Collection<HibernateDialect> c = dbNameDialectMap.values();
!         return c.toArray();
!     }
!         
  }
--- 417,472 ----
  	 * @return the dialect that the user picked.
  	 */
! 	private static HibernateDialect showDialectDialog(JFrame parent, int sessionType)
! 		throws UserCancelledOperationException
! 	{
! 		Object[] dbNames = getDbNames();
! 		String chooserTitle = s_stringMgr.getString("dialectChooseTitle");
! 		String typeStr = null;
! 		if (sessionType == SOURCE_TYPE)
! 		{
! 			typeStr = s_stringMgr.getString("sourceSessionTypeName");
! 		}
! 		if (sessionType == DEST_TYPE)
! 		{
! 			typeStr = s_stringMgr.getString("destSessionTypeName");
! 		}
! 		String message = s_stringMgr.getString("dialectDetectFailedMessage", typeStr);
! 		if (isPromptForDialect)
! 		{
! 			message = s_stringMgr.getString("autoDetectDisabledMessage", typeStr);
! 		}
! 
! 		String dbName =
  			dialogUtils.showInputDialog(parent, message, chooserTitle, JOptionPane.INFORMATION_MESSAGE, null,
  				dbNames, dbNames[0]);
! 
! 		if (dbName == null || "".equals(dbName)) { throw new UserCancelledOperationException(); }
! 		return dbNameDialectMap.get(dbName);
! 	}
! 
! 	/**
! 	 * Returns a list of Database server names that can be preented to the user whenever we want the user to
! 	 * pick a dialect.
! 	 * 
! 	 * @return
! 	 */
! 	public static Object[] getDbNames()
! 	{
! 		Set<String> keyset = dbNameDialectMap.keySet();
! 		Object[] keys = keyset.toArray();
! 		Arrays.sort(keys);
! 		return keys;
! 	}
! 
! 	/**
! 	 * Returns an array of HibernateDialect instances, one for each supported dialect.
! 	 * 
! 	 * @return
! 	 */
! 	public static Object[] getSupportedDialects()
! 	{
! 		Collection<HibernateDialect> c = dbNameDialectMap.values();
! 		return c.toArray();
! 	}
! 
  }

Index: DialectType.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DialectType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DialectType.java	6 Dec 2007 03:37:09 -0000	1.2
--- DialectType.java	25 Dec 2009 02:58:30 -0000	1.3
***************
*** 43,46 ****
--- 43,47 ----
     MYSQL,     // MySQL 4.x and below
     MYSQL5,    // MySQL 5.x and above
+    NETEZZA,
     ORACLE,
     POINTBASE,

--- NEW FILE: NetezzaDialextExt.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.dialects;

import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.ADD_COLUMN_TYPE;
import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.COLUMN_DROP_TYPE;
import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.COLUMN_NULL_ALTER_TYPE;
import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.COLUMN_TYPE_ALTER_TYPE;
import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.CREATE_INDEX_TYPE;
import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.DROP_INDEX_TYPE;
import static net.sourceforge.squirrel_sql.fw.dialects.DialectUtils.getUnsupportedMessage;

import java.sql.Types;
import java.util.HashMap;
import java.util.List;

import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
import net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo;

import org.antlr.stringtemplate.StringTemplate;
import org.hibernate.HibernateException;

/**
 * Dialect for the Netezza NPS database server.
 */
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.
	private class NetezzaDialectHelper extends org.hibernate.dialect.PostgreSQLDialect
	{
		public NetezzaDialectHelper()
		{
			super();
			registerColumnType(Types.BIGINT, "bigint");
			registerColumnType(Types.BIT, "bool");
			registerColumnType(Types.BOOLEAN, "bool");
			registerColumnType(Types.CHAR, 64000, "char($l)");
			registerColumnType(Types.CHAR, "char(64000)");
			// Netezza 4.6 doesn't support text or any large character object data type
			// registerColumnType(Types.CLOB, "text");
			registerColumnType(Types.DATE, "date");
			registerColumnType(Types.DECIMAL, "decimal($p,2)");
			registerColumnType(Types.DOUBLE, "double precision");
			registerColumnType(Types.FLOAT, 15, "float($p)");
			registerColumnType(Types.FLOAT, "float(15)");
			registerColumnType(Types.INTEGER, "int");
			// Netezza 4.6 doesn't appear to support bytea or any binary type.
			// registerColumnType(Types.LONGVARBINARY, "bytea");
			registerColumnType(Types.LONGVARCHAR, "char(64000)");
			registerColumnType(Types.NUMERIC, "numeric($p,$s)");
			registerColumnType(Types.REAL, "real");
			registerColumnType(Types.SMALLINT, "smallint");
			registerColumnType(Types.TIME, "time");
			registerColumnType(Types.TIMESTAMP, "timestamp");
			registerColumnType(Types.TINYINT, "byteint");
			// Netezza 4.6 doesn't appear to support bytea or any binary type.
			// registerColumnType(Types.VARBINARY, "bytea");
			registerColumnType(Types.VARCHAR, 64000, "varchar($l)");
			registerColumnType(Types.VARCHAR, "varchar(64000)");
		}
	}

	/** extended hibernate dialect used in this wrapper */
	private NetezzaDialectHelper _dialect = new NetezzaDialectHelper();

	private String cascadeClause;

	@Override
	public DialectType getDialectType()
	{
		return DialectType.NETEZZA;
	}

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

	@Override
	public String getDropSequenceSQL(String sequenceName, boolean cascade, DatabaseObjectQualifier qualifier,
		SqlGenerationPreferences prefs)
	{
		// "DROP SEQUENCE $sequenceName$ $cascade$";
		StringTemplate st = new StringTemplate(ST_DROP_SEQUENCE_STYLE_ONE);

		HashMap<String, String> valuesMap = DialectUtils.getValuesMap(ST_SEQUENCE_NAME_KEY, sequenceName);

		return DialectUtils.bindTemplateAttributes(this, st, valuesMap, qualifier, prefs);
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getMaxPrecision(int)
	 */
	@Override
	public int getMaxPrecision(int dataType)
	{
		return 38;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getMaxScale(int)
	 */
	@Override
	public int getMaxScale(int dataType)
	{
		// user guide says scale can be 0 to as large as the precision. It cannot be
		// greater than the precision.
		return 38;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getPrecisionDigits(int, int)
	 */
	@Override
	public int getPrecisionDigits(int columnSize, int dataType)
	{
		// Netezza correctly reports the size of the column in digits.
		return columnSize;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getTypeName(int, int, int, int)
	 */
	@Override
	public String getTypeName(int code, int length, int precision, int scale) throws HibernateException
	{
		return _dialect.getTypeName(code, length, precision, scale);
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAccessMethods()
	 */
	@Override
	public boolean supportsAccessMethods()
	{
		// Access methods have to do with indexes. Since Netezza disallows users from creating or changing
		// indexes, this is unsupported
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAddColumn()
	 */
	@Override
	public boolean supportsAddColumn()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAddForeignKeyConstraint()
	 */
	@Override
	public boolean supportsAddForeignKeyConstraint()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAddUniqueConstraint()
	 */
	@Override
	public boolean supportsAddUniqueConstraint()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAlterColumnDefault()
	 */
	@Override
	public boolean supportsAlterColumnDefault()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAlterColumnNull()
	 */
	@Override
	public boolean supportsAlterColumnNull()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAlterColumnType()
	 */
	@Override
	public boolean supportsAlterColumnType()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAlterSequence()
	 */
	@Override
	public boolean supportsAlterSequence()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAutoIncrement()
	 */
	@Override
	public boolean supportsAutoIncrement()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCheckOptionsForViews()
	 */
	@Override
	public boolean supportsCheckOptionsForViews()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsColumnComment()
	 */
	@Override
	public boolean supportsColumnComment()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCorrelatedSubQuery()
	 */
	@Override
	public boolean supportsCorrelatedSubQuery()
	{
		// Although Netezza claims to support correlated sub-queries, the type of sub-query we want is not
		// supported:
		// update TOTABLE t set t.MYDESC =
		// (
		// select
		// f.MYDESC
		// from FROMTABLE f
		// where f.myid = t.myid
		// )
		// Furthermore, the only refactoring that currently uses this is MergeTable which also requires
		// add column support, which Netezza also doesn't seem to have.
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateIndex()
	 */
	@Override
	public boolean supportsCreateIndex()
	{
		// Since Netezza disallows users from creating or changing indexes, this is unsupported
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateSequence()
	 */
	@Override
	public boolean supportsCreateSequence()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateTable()
	 */
	@Override
	public boolean supportsCreateTable()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateView()
	 */
	@Override
	public boolean supportsCreateView()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropColumn()
	 */
	@Override
	public boolean supportsDropColumn()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropConstraint()
	 */
	@Override
	public boolean supportsDropConstraint()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropIndex()
	 */
	@Override
	public boolean supportsDropIndex()
	{
		// Since Netezza disallows users from creating or changing indexes, this is unsupported
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropSequence()
	 */
	@Override
	public boolean supportsDropSequence()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropView()
	 */
	@Override
	public boolean supportsDropView()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsEmptyTables()
	 */
	@Override
	public boolean supportsEmptyTables()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsIndexes()
	 */
	@Override
	public boolean supportsIndexes()
	{
		// Since Netezza disallows users from creating or changing indexes, this is unsupported
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsInsertInto()
	 */
	@Override
	public boolean supportsInsertInto()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsMultipleRowInserts()
	 */
	@Override
	public boolean supportsMultipleRowInserts()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsProduct(java.lang.String,
	 *      java.lang.String)
	 */
	@Override
	public boolean supportsProduct(String databaseProductName, String databaseProductVersion)
	{
		if (databaseProductName == null) { return false; }
		if (databaseProductName.trim().startsWith("Netezza"))
		{
			// We don't yet have the need to discriminate by version.
			return true;
		}
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsRenameColumn()
	 */
	@Override
	public boolean supportsRenameColumn()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsRenameTable()
	 */
	@Override
	public boolean supportsRenameTable()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsRenameView()
	 */
	@Override
	public boolean supportsRenameView()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsSchemasInTableDefinition()
	 */
	@Override
	public boolean supportsSchemasInTableDefinition()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsSequence()
	 */
	@Override
	public boolean supportsSequence()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsSequenceInformation()
	 */
	@Override
	public boolean supportsSequenceInformation()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsTablespace()
	 */
	@Override
	public boolean supportsTablespace()
	{
		return false;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsUpdate()
	 */
	@Override
	public boolean supportsUpdate()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsViewDefinition()
	 */
	@Override
	public boolean supportsViewDefinition()
	{
		return true;
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getTableDropSQL(net.sourceforge.squirrel_sql.fw.sql.ITableInfo,
	 *      boolean, boolean, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
	 */
	@Override
	public List<String> getTableDropSQL(ITableInfo tableInfo, boolean cascadeConstraints,
		boolean isMaterializedView, DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
	{
		final boolean supportsCascade = false;
		final boolean supportsMatViews = true;
		return DialectUtils.getTableDropSQL(tableInfo, supportsCascade, cascadeConstraints, supportsMatViews,
			cascadeClause, isMaterializedView, qualifier, prefs, this);
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDropSQL(java.lang.String,
	 *      java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
	 */
	@Override
	public String getColumnDropSQL(String tableName, String columnName, DatabaseObjectQualifier qualifier,
		SqlGenerationPreferences prefs) throws UnsupportedOperationException
	{
		throw new UnsupportedOperationException(getUnsupportedMessage(this, COLUMN_DROP_TYPE));
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getCreateIndexSQL(java.lang.String,
	 *      java.lang.String, java.lang.String, java.lang.String[], boolean, java.lang.String,
	 *      java.lang.String, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
	 */
	@Override
	public String getCreateIndexSQL(String indexName, String tableName, String accessMethod, String[] columns,
		boolean unique, String tablespace, String constraints, DatabaseObjectQualifier qualifier,
		SqlGenerationPreferences prefs)
	{
		throw new UnsupportedOperationException(getUnsupportedMessage(this, CREATE_INDEX_TYPE));
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getDropIndexSQL(java.lang.String,
	 *      java.lang.String, boolean, net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
	 */
	@Override
	public String getDropIndexSQL(String tableName, String indexName, boolean cascade,
		DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
	{
		throw new UnsupportedOperationException(getUnsupportedMessage(this, DROP_INDEX_TYPE));
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getAddColumnSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
	 */
	@Override
	public String[] getAddColumnSQL(TableColumnInfo column, DatabaseObjectQualifier qualifier,
		SqlGenerationPreferences prefs)
	{
		throw new UnsupportedOperationException(getUnsupportedMessage(this, ADD_COLUMN_TYPE));
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnNullableAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
	 */
	@Override
	public String[] getColumnNullableAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier,
		SqlGenerationPreferences prefs)
	{
		throw new UnsupportedOperationException(getUnsupportedMessage(this, COLUMN_NULL_ALTER_TYPE));
	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnTypeAlterSQL(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
	public List<String> getColumnTypeAlterSQL(TableColumnInfo from, TableColumnInfo to,
		DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs) throws UnsupportedOperationException
	{
		throw new UnsupportedOperationException(getUnsupportedMessage(this, COLUMN_TYPE_ALTER_TYPE));

	}

	/**
	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getColumnDefaultAlterSQL(net.sourceforge.squirrel_sql.fw.sql.TableColumnInfo,
	 *      net.sourceforge.squirrel_sql.fw.dialects.DatabaseObjectQualifier,
	 *      net.sourceforge.squirrel_sql.fw.dialects.SqlGenerationPreferences)
	 */
	@Override
	public String getColumnDefaultAlterSQL(TableColumnInfo info, DatabaseObjectQualifier qualifier,
		SqlGenerationPreferences prefs)
	{
		String alterClause = DialectUtils.ALTER_COLUMN_CLAUSE;
		boolean specifyType = false;
		String defaultClause = DialectUtils.SET_DEFAULT_CLAUSE;
		return DialectUtils.getColumnDefaultAlterSQL(this, info, alterClause, specifyType, defaultClause,
			qualifier, prefs);
	}

	/**
	 * @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
	public String getColumnNameAlterSQL(TableColumnInfo from, TableColumnInfo to,
		DatabaseObjectQualifier qualifier, SqlGenerationPreferences prefs)
	{
		String alterClause = DialectUtils.RENAME_COLUMN_CLAUSE;
		String renameToClause = DialectUtils.TO_CLAUSE;
		return DialectUtils.getColumnNameAlterSQL(from, to, alterClause, renameToClause, qualifier, prefs, this);
	}

}

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects DialectUtils.java, 1.64, 1.65

[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-serv29162/fw/src/net/sourceforge/squirrel_sql/fw/dialects

Modified Files:
	DialectUtils.java 
Log Message:
Fixed Javadoc comments.

Index: DialectUtils.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/dialects/DialectUtils.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** DialectUtils.java	24 Jul 2009 05:51:43 -0000	1.64
--- DialectUtils.java	25 Dec 2009 02:57:13 -0000	1.65
***************
*** 937,942 ****
  
  	/**
! 	 * Returns the SQL that is used to change the column name. ALTER TABLE table_name [alterClause] column_name
! 	 * [renameToClause] column_name
  	 * 
  	 * @param from
--- 937,945 ----
  
  	/**
! 	 * Returns the SQL that is used to change the column name. <code>
! 	 * For example:
! 	 * 
! 	 * ALTER TABLE table_name [alterClause] column_name [renameToClause] column_name
! 	 * </code>
  	 * 
  	 * @param from
***************
*** 983,989 ****
  
  	/**
! 	 * Returns the SQL command to change the specified column's default value ALTER TABLE table_name ALTER
! 	 * COLUMN column_name [defaultClause] 'defaultVal' ALTER TABLE table_name ALTER COLUMN column_name
! 	 * [defaultClause] 1234
  	 * 
  	 * @param dialect
--- 986,998 ----
  
  	/**
! 	 * Returns the SQL command to change the specified column's default value. <code>
! 	 * For example: 
! 	 * 
! 	 * ALTER TABLE table_name ALTER COLUMN column_name [defaultClause] 'defaultVal'
! 	 *  
! 	 * or
! 	 *  
! 	 * ALTER TABLE table_name ALTER COLUMN column_name [defaultClause] 1234
! 	 * </code>
  	 * 
  	 * @param dialect
***************
*** 991,996 ****
--- 1000,1009 ----
  	 * @param info
  	 *           the column to modify and it's default value.
+ 	 * @param alterClause
+ 	 *           alter phrase that precedes the column name (e.g. ALTER COLUMN)
  	 * @param specifyType
  	 *           whether or not to specify the column type
+ 	 * @param defaultClause
+ 	 *           alter phrase that precedes the default value (e.g. SET DEFAULT)
  	 * @param qualifier
  	 *           qualifier of the table
***************
*** 1040,1045 ****
  
  	/**
! 	 * Returns the SQL that is used to change the column type. ALTER TABLE table_name alter_clause column_name
! 	 * [setClause] data_type ALTER TABLE table_name alter_clause column_name column_name [setClause] data_type
  	 * 
  	 * @param from
--- 1053,1064 ----
  
  	/**
! 	 * Returns the SQL that is used to change the column type. For example:
! 	 * <code>
! 	 * ALTER TABLE table_name alter_clause column_name [setClause] data_type 
! 	 * </code>
! 	 * or
! 	 * <code>
! 	 * ALTER TABLE table_name alter_clause column_name column_name [setClause] data_type
! 	 * </code>
  	 * 
  	 * @param from
***************
*** 1091,1096 ****
  
  	/**
! 	 * Returns the SQL that is used to change the column name. RENAME COLUMN table_name.column_name TO
! 	 * new_column_name
  	 * 
  	 * @param from
--- 1110,1117 ----
  
  	/**
! 	 * Returns the SQL that is used to change the column name. For example:
! 	 * <code>
! 	 * RENAME COLUMN table_name.column_name TO new_column_name
! 	 * </code>
  	 * 
  	 * @param from
***************
*** 1146,1187 ****
  		{
  		case COLUMN_COMMENT_ALTER_TYPE:
! 			// i18n[DialectUtils.columnCommentUnsupported={0} doesn''t support
! 			// column comments]
  			msg = s_stringMgr.getString("DialectUtils.columnCommentUnsupported", dialect.getDisplayName());
  			break;
  		case COLUMN_DEFAULT_ALTER_TYPE:
! 			// i18n[DialectUtils.columnDefaultUnsupported={0} doesn''t support
! 			// altering a column''s default value]
  			msg = s_stringMgr.getString("DialectUtils.columnDefaultUnsupported", dialect.getDisplayName());
  			break;
  
  		case COLUMN_DROP_TYPE:
! 			// i18n[DialectUtils.columnDropUnsupported={0} doesn''t support
! 			// dropping a column]
  			msg = s_stringMgr.getString("DialectUtils.columnDropUnsupported", dialect.getDisplayName());
  			break;
  		case COLUMN_NAME_ALTER_TYPE:
! 			// i18n[DialectUtils.columnNameUnsupported={0} doesn''t support
! 			// altering a column''s name]
  			msg = s_stringMgr.getString("DialectUtils.columnNameUnsupported", dialect.getDisplayName());
  			break;
  		case COLUMN_NULL_ALTER_TYPE:
! 			// i18n[DialectUtils.columnNullUnsupported={0} doesn''t support
! 			// altering a column's nullable attribute]
  			msg = s_stringMgr.getString("DialectUtils.columnNullUnsupported", dialect.getDisplayName());
  			break;
  		case COLUMN_TYPE_ALTER_TYPE:
! 			// i18n[DialectUtils.columnTypeUnsupported={0} doesn''t support
! 			// altering a column's type attribute]
  			msg = s_stringMgr.getString("DialectUtils.columnTypeUnsupported", dialect.getDisplayName());
  			break;
  		case ADD_PRIMARY_KEY_TYPE:
! 			// i18n[DialectUtils.addPrimaryKeyUnsupported={0} doesn''t
! 			// support adding primary keys]
  			msg = s_stringMgr.getString("DialectUtils.addPrimaryKeyUnsupported", dialect.getDisplayName());
  			break;
  		case DROP_PRIMARY_KEY_TYPE:
! 			// i18n[DialectUtils.dropPrimaryKeyUnsupported={0} doesn''t
! 			// support dropping primary keys]
  			msg = s_stringMgr.getString("DialectUtils.dropPrimaryKeyUnsupported", dialect.getDisplayName());
  			break;
--- 1167,1202 ----
  		{
  		case COLUMN_COMMENT_ALTER_TYPE:
! 			// i18n[DialectUtils.columnCommentUnsupported={0} doesn''t support column comments]
  			msg = s_stringMgr.getString("DialectUtils.columnCommentUnsupported", dialect.getDisplayName());
  			break;
  		case COLUMN_DEFAULT_ALTER_TYPE:
! 			// i18n[DialectUtils.columnDefaultUnsupported={0} doesn''t support altering a column''s default 
! 			// value]
  			msg = s_stringMgr.getString("DialectUtils.columnDefaultUnsupported", dialect.getDisplayName());
  			break;
  
  		case COLUMN_DROP_TYPE:
! 			// i18n[DialectUtils.columnDropUnsupported={0} doesn''t support dropping a column]
  			msg = s_stringMgr.getString("DialectUtils.columnDropUnsupported", dialect.getDisplayName());
  			break;
  		case COLUMN_NAME_ALTER_TYPE:
! 			// i18n[DialectUtils.columnNameUnsupported={0} doesn''t support altering a column''s name]
  			msg = s_stringMgr.getString("DialectUtils.columnNameUnsupported", dialect.getDisplayName());
  			break;
  		case COLUMN_NULL_ALTER_TYPE:
! 			// i18n[DialectUtils.columnNullUnsupported={0} doesn''t support altering a column's nullable 
! 			// attribute]
  			msg = s_stringMgr.getString("DialectUtils.columnNullUnsupported", dialect.getDisplayName());
  			break;
  		case COLUMN_TYPE_ALTER_TYPE:
! 			// i18n[DialectUtils.columnTypeUnsupported={0} doesn''t support altering a column's type attribute]
  			msg = s_stringMgr.getString("DialectUtils.columnTypeUnsupported", dialect.getDisplayName());
  			break;
  		case ADD_PRIMARY_KEY_TYPE:
! 			// i18n[DialectUtils.addPrimaryKeyUnsupported={0} doesn''t support adding primary keys]
  			msg = s_stringMgr.getString("DialectUtils.addPrimaryKeyUnsupported", dialect.getDisplayName());
  			break;
  		case DROP_PRIMARY_KEY_TYPE:
! 			// i18n[DialectUtils.dropPrimaryKeyUnsupported={0} doesn''t support dropping primary keys]
  			msg = s_stringMgr.getString("DialectUtils.dropPrimaryKeyUnsupported", dialect.getDisplayName());
  			break;
***************
*** 1232,1237 ****
  
  	/**
! 	 * Returns the SQL command to drop the specified table's primary key. alter table table_name drop primary
! 	 * key or alter table table_name drop constraint [pkName]
  	 * 
  	 * @param pkName
--- 1247,1258 ----
  
  	/**
! 	 * Returns the SQL command to drop the specified table's primary key. For example:
! 	 * <code>
! 	 * alter table table_name drop primary key 
! 	 * </code>
! 	 * or 
! 	 * <code>
! 	 * alter table table_name drop constraint [pkName]
! 	 * </code>
  	 * 
  	 * @param pkName

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

[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-serv8102/test/external/net/sourceforge/squirrel_sql/fw/dialects

Modified Files:
	DialectExternalTest.java 
Log Message:
Consolidate calls to fixIdentifierCase in one place; more to come.

Index: DialectExternalTest.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/external/net/sourceforge/squirrel_sql/fw/dialects/DialectExternalTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** DialectExternalTest.java	20 Jun 2009 23:56:01 -0000	1.19
--- DialectExternalTest.java	24 Dec 2009 21:01:46 -0000	1.20
***************
*** 29,34 ****
--- 29,37 ----
  
  import java.awt.Component;
+ import java.awt.Toolkit;
  import java.awt.event.ActionListener;
  import java.io.FileReader;
+ import java.lang.annotation.Annotation;
+ import java.lang.reflect.Method;
  import java.sql.Connection;
  import java.sql.DatabaseMetaData;
[...1218 lines suppressed...]
  		else
  		{
! 			result = identifier.toLowerCase();
  		}
  		return result;
--- 2809,2822 ----
  		else
  		{
! 			if (DialectFactory.isNetezza(md))
! 			{
! 				// Netezza driver has a bug
! 				// (storesUpperCaseIdentifiers == false; yet it stores them uppercase)
! 				result = identifier.toUpperCase();
! 			}
! 			else
! 			{
! 				result = identifier.toLowerCase();
! 			}
  		}
  		return result;

[Squirrel-sql-commits] sql12/build build.xml,1.99,1.100

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

Update of /cvsroot/squirrel-sql/sql12/build
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9542/build

Modified Files:
	build.xml 
Log Message:
Removed Dialect external tests from regular junit test target.  This test is now run separately in Hudson, each dialect with it's own build job to make it easier to spot which dialects are passing/failing.

Index: build.xml
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/build/build.xml,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** build.xml	20 Jun 2009 21:48:59 -0000	1.99
--- build.xml	22 Dec 2009 16:00:43 -0000	1.100
***************
*** 1073,1079 ****
--- 1073,1081 ----
  					<exclude name="**/Abstract*.java"/>
  				</fileset>
+ 				<!-- This test is run separately in hudson 
  				<fileset dir="test/external">
  					<include name="**/DialectExternalTest.java" />
  				</fileset>
+ 				-->
  		        	<fileset dir="test/jfctests">
  		        		   <!-- FEST tests must end in UITest.java to get included -->

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db JTreeAliasesListImpl.java, 1.12, 1.13

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10830/app/src/net/sourceforge/squirrel_sql/client/gui/db

Modified Files:
	JTreeAliasesListImpl.java 
Log Message:
ArrayIndexOutOfBounds exception occured when more than one Alias was deleted form Alias tree

Index: JTreeAliasesListImpl.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/JTreeAliasesListImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JTreeAliasesListImpl.java	29 Nov 2009 21:17:54 -0000	1.12
--- JTreeAliasesListImpl.java	22 Dec 2009 10:37:13 -0000	1.13
***************
*** 332,337 ****
        treeModel.removeNodeFromParent(delNode);
  
-       treeModel.nodesWereRemoved(parent, new int[]{indexOfChild}, new Object[]{delNode});
-       //treeModel.nodeStructureChanged(parent);
  
        if(null != nextToSel)
--- 332,335 ----
***************
*** 500,507 ****
           if (Dialogs.showYesNo(_app.getMainFrame(), s_stringMgr.getString("JTreeAliasesListImpl.confirmDeleteMultible")))
           {
              for (TreePath selectionPath : selectionPaths)
              {
                 DefaultMutableTreeNode selNode = (DefaultMutableTreeNode) selectionPath.getLastPathComponent();
!                TreeNode parent = selNode.getParent();
  
                 if(selNode.getUserObject() instanceof SQLAlias)
--- 498,506 ----
           if (Dialogs.showYesNo(_app.getMainFrame(), s_stringMgr.getString("JTreeAliasesListImpl.confirmDeleteMultible")))
           {
+             final HashSet<TreeNode> parentsRemovedFrom = new HashSet<TreeNode>();
              for (TreePath selectionPath : selectionPaths)
              {
                 DefaultMutableTreeNode selNode = (DefaultMutableTreeNode) selectionPath.getLastPathComponent();
!                parentsRemovedFrom.add(selNode.getParent());
  
                 if(selNode.getUserObject() instanceof SQLAlias)
***************
*** 514,521 ****
                    removeAllAliasesFromNode(selNode);
                    selNode.removeFromParent();
-                   DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
-                   dtm.nodeStructureChanged(parent);
                 }
              }
           }
        }
--- 513,532 ----
                    removeAllAliasesFromNode(selNode);
                    selNode.removeFromParent();
                 }
              }
+ 
+             final DefaultTreeModel dtm = (DefaultTreeModel) _tree.getModel();
+ 
+             SwingUtilities.invokeLater(
+                new Runnable()
+                {
+                   public void run()
+                   {
+                      for (TreeNode node : parentsRemovedFrom)
+                      {
+                         dtm.nodeStructureChanged(node);
+                      }
+                   }
+                });
           }
        }

[Squirrel-sql-commits] sql12/doc changes.txt,1.522,1.523

[Gerd W. <ger...@us...>]

Update of /cvsroot/squirrel-sql/sql12/doc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10830/doc

Modified Files:
	changes.txt 
Log Message:
ArrayIndexOutOfBounds exception occured when more than one Alias was deleted form Alias tree

Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v
retrieving revision 1.522
retrieving revision 1.523
diff -C2 -d -r1.522 -r1.523
*** changes.txt	19 Dec 2009 21:35:29 -0000	1.522
--- changes.txt	22 Dec 2009 10:37:13 -0000	1.523
***************
*** 82,85 ****
--- 82,87 ----
  Bug-Fixes:
  
+ ArrayIndexOutOfBounds exception occured when more than one Alias was deleted form Alias tree  
+ 
  2879711: Fix for Excel date export concerning dates earlier than 1900-03-01.
   Thanks to mironsadziak for the patch (Patch ID 2905218)

[Squirrel-sql-commits] sql12/doc changes.txt,1.521,1.522

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

Update of /cvsroot/squirrel-sql/sql12/doc
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2233/doc

Modified Files:
	changes.txt 
Log Message:
Aliases now have the ability to setup keep-alive SQL statement and sleep time (in seconds) to prevent a connection from being disconnected while appearing to be idle.

Index: changes.txt
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/doc/changes.txt,v
retrieving revision 1.521
retrieving revision 1.522
diff -C2 -d -r1.521 -r1.522
*** changes.txt	6 Dec 2009 00:15:49 -0000	1.521
--- changes.txt	19 Dec 2009 21:35:29 -0000	1.522
***************
*** 7,10 ****
--- 7,14 ----
  Enhancements:
  
+ Aliases now have the ability to setup a keep-alive SQL statement and sleep time (in seconds) to prevent a 
+ connection from being disconnected while appearing to be idle.  This is done using the new Connection tab 
+ on the Alias properties dialog.
+ 
  Derby Plugin:
   New tab to display the source code of Derby stored procedures 

[Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/client AppTestUtil.java, 1.4, 1.5

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

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

Modified Files:
	AppTestUtil.java 
Log Message:
Aliases now have the ability to setup keep-alive SQL statement and sleep time (in seconds) to prevent a connection from being disconnected while appearing to be idle.

Index: AppTestUtil.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client/AppTestUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AppTestUtil.java	16 Dec 2009 02:07:33 -0000	1.4
--- AppTestUtil.java	19 Dec 2009 21:33:52 -0000	1.5
***************
*** 39,42 ****
--- 39,43 ----
  import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
  import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasColorProperties;
+ import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasConnectionProperties;
  import net.sourceforge.squirrel_sql.client.gui.session.SessionInternalFrame;
  import net.sourceforge.squirrel_sql.client.gui.session.SessionPanel;
***************
*** 359,363 ****
--- 360,371 ----
  	   expect(mockSqlAlias.getDriverPropertiesClone()).andReturn(mockSqlDriverPropCol)
  	                                                  .anyTimes();
+ 	   SQLAliasConnectionProperties mockConnProps = createMock(SQLAliasConnectionProperties.class);
+ 	   expect(mockConnProps.isEnableConnectionKeepAlive()).andStubReturn(false);
+ 	   expect(mockConnProps.getKeepAliveSleepTimeSeconds()).andStubReturn(120);
+ 	   expect(mockConnProps.getKeepAliveSqlStatement()).andStubReturn("");
+ 	   expect(mockSqlAlias.getConnectionProperties()).andStubReturn(mockConnProps);
+ 	   
  	   replay(mockSqlAlias);
+ 	   replay(mockConnProps);
  	   return mockSqlAlias;
  	}

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql ISQLAlias.java, 1.15, 1.16

[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-serv1839/fw/src/net/sourceforge/squirrel_sql/fw/sql

Modified Files:
	ISQLAlias.java 
Log Message:
Aliases now have the ability to setup keep-alive SQL statement and sleep time (in seconds) to prevent a connection from being disconnected while appearing to be idle.

Index: ISQLAlias.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/sql/ISQLAlias.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ISQLAlias.java	28 Nov 2009 20:14:51 -0000	1.15
--- ISQLAlias.java	19 Dec 2009 21:33:51 -0000	1.16
***************
*** 49,52 ****
--- 49,53 ----
  		String SCHEMA_PROPERTIES = "schemaProperties";
  		String COLOR_PROPERTIES = "colorProperties";
+ 		String CONNECTION_PROPERTIES = "connectionProperties";
  	}
  

[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/util TaskThreadPool.java, 1.6, 1.7

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

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

Modified Files:
	TaskThreadPool.java 
Log Message:
Aliases now have the ability to setup keep-alive SQL statement and sleep time (in seconds) to prevent a connection from being disconnected while appearing to be idle.

Index: TaskThreadPool.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/TaskThreadPool.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TaskThreadPool.java	9 Sep 2007 01:32:29 -0000	1.6
--- TaskThreadPool.java	19 Dec 2009 21:33:51 -0000	1.7
***************
*** 52,62 ****
     private JFrame _parentForMessages = null;
  
! 	/**
  	 * Add a task to be executed by the next available thread
  	 * in this thread pool. If there is no free thread available
  	 * but the maximum number of threads hasn't been reached then
  	 * create a new thread.
! 	 */
! 	public synchronized void addTask(Runnable task)
  		throws IllegalArgumentException
  	{
--- 52,89 ----
     private JFrame _parentForMessages = null;
  
!    /**
  	 * Add a task to be executed by the next available thread
  	 * in this thread pool. If there is no free thread available
  	 * but the maximum number of threads hasn't been reached then
  	 * create a new thread.
! 	 *  
!     * @param task the Runnable to give to the thread
!     * @param taskName the name of the task (used to set the Thread name)
!     * @throws IllegalArgumentException
!     */
!    public synchronized void addTask(Runnable task, String taskName) 
!    	throws IllegalArgumentException 
!    {
!    	_addTask(task, taskName);
!    }
!    
!    /**
! 	 * Add a task to be executed by the next available thread
! 	 * in this thread pool. If there is no free thread available
! 	 * but the maximum number of threads hasn't been reached then
! 	 * create a new thread.
! 	 *  
!     * @param task
!     * @throws IllegalArgumentException
!     * @Deprecated Please use the form that accepts a task name instead. 
!     */
!    public synchronized void addTask(Runnable task) 
! 		throws IllegalArgumentException 
! 	{
!    	_addTask(task, null);
! 	}
!    
!    
! 	private synchronized void _addTask(Runnable task, String taskName)
  		throws IllegalArgumentException
  	{
***************
*** 70,73 ****
--- 97,103 ----
  		{
  			Thread th = new Thread(new TaskExecuter(_callback));
+ 			if (taskName != null) {
+ 				th.setName(taskName);
+ 			}
  			th.setPriority(Thread.MIN_PRIORITY); //??
  			th.setDaemon(true);

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties ConnectionPropertiesController.java, NONE, 1.1 ConnectionPropertiesPanel.java, NONE, 1.1 I18NStrings.properties, 1.11, 1.12 AliasPropertiesController.java, 1.7, 1.8 ColorPropertiesController.java, 1.2, 1.3

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

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1839/app/src/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties

Modified Files:
	I18NStrings.properties AliasPropertiesController.java 
	ColorPropertiesController.java 
Added Files:
	ConnectionPropertiesController.java 
	ConnectionPropertiesPanel.java 
Log Message:
Aliases now have the ability to setup keep-alive SQL statement and sleep time (in seconds) to prevent a connection from being disconnected while appearing to be idle.

Index: AliasPropertiesController.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/AliasPropertiesController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AliasPropertiesController.java	28 Nov 2009 20:14:51 -0000	1.7
--- AliasPropertiesController.java	19 Dec 2009 21:33:51 -0000	1.8
***************
*** 96,99 ****
--- 96,100 ----
        _iAliasPropertiesPanelControllers.add(new DriverPropertiesController(_alias, _app));
        _iAliasPropertiesPanelControllers.add(new ColorPropertiesController(_alias, _app));
+       _iAliasPropertiesPanelControllers.add(new ConnectionPropertiesController(_alias, _app));
        
        IAliasPropertiesPanelController[] pluginAliasPropertiesPanelControllers =

--- NEW FILE: ConnectionPropertiesController.java ---
package net.sourceforge.squirrel_sql.client.gui.db.aliasproperties;

/*
 * Copyright (C) 2009 Rob Manning
 * man...@us...
 * 
 * Based on initial work from Colin Bell
 *
 * 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.awt.Component;

import net.sourceforge.squirrel_sql.client.IApplication;
import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;

/**
 * This dialog allows the user to review and maintain connection properties for an alias.
 */
public class ConnectionPropertiesController implements IAliasPropertiesPanelController
{
	/**
	 * Internationalized strings for this class.
	 */
	private static final StringManager s_stringMgr =
		StringManagerFactory.getStringManager(ConnectionPropertiesController.class);

	private ConnectionPropertiesPanel _propsPnl;

	private ISQLAliasExt _alias;

	public static interface i18n {
		// i18n[ConnectionPropertiesController.title=Connection]
		String TITLE = s_stringMgr.getString("ConnectionPropertiesController.title");
		
		// i18n[ConnectionPropertiesController.hint=Set session connection properties for this Alias]
		String HINT = s_stringMgr.getString("ConnectionPropertiesController.hint");
	}
	
	public ConnectionPropertiesController(ISQLAliasExt alias, IApplication app)
	{
		_alias = alias;
		_propsPnl = new ConnectionPropertiesPanel(alias.getConnectionProperties());
	}

	public Component getPanelComponent()
	{
		return _propsPnl;
	}

	public void applyChanges()
	{
		_alias.setConnectionProperties(_propsPnl.getSQLAliasConnectionProperties());
	}

	public String getTitle()
	{
		return i18n.TITLE;
	}

	public String getHint()
	{
		return i18n.HINT;
	}

}

Index: I18NStrings.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/I18NStrings.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** I18NStrings.properties	28 Nov 2009 21:38:59 -0000	1.11
--- I18NStrings.properties	19 Dec 2009 21:33:51 -0000	1.12
***************
*** 11,15 ****
  
  ColorPropertiesController.hint=Set session colors for this Alias
! ColorPropertiesController.title=Color Properties
  
  
--- 11,15 ----
  
  ColorPropertiesController.hint=Set session colors for this Alias
! ColorPropertiesController.title=Color
  
  
***************
*** 27,30 ****
--- 27,41 ----
  ColorPropertiesPanel.toolbarBackgroundColorChooserDialogTitle=Select Background Color for Toolbar
  
+ ConnectionPropertiesController.title=Connection
+ ConnectionPropertiesController.hint=Set session connection properties for this Alias
+ 
+ ConnectionPropertiesPanel.enableKeepAliveMsg=Enable Keep-Alive
+ ConnectionPropertiesPanel.instructions=These settings control whether or not to enable a sort of keep-alive \
+ scheme for database connections created by this alias.  When enabled, after creating a new session to the \
+ database, this will cause the SQL statement specified below to be executed in the background.  This will \
+ continue, pausing for the specified sleep time below, as long as the session remains connected.   
+ ConnectionPropertiesPanel.secondsLabel=seconds
+ ConnectionPropertiesPanel.executeLabel=Execute the following SQL statement:
+ ConnectionPropertiesPanel.sleepForLabel=Sleep for
  
  DriverPropertiesController.noDriverSelected=No driver available in this Alias.\nCan not load driver properties tab.

Index: ColorPropertiesController.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/aliasproperties/ColorPropertiesController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ColorPropertiesController.java	28 Nov 2009 21:38:59 -0000	1.2
--- ColorPropertiesController.java	19 Dec 2009 21:33:51 -0000	1.3
***************
*** 45,49 ****
  
  	public static interface i18n {
! 		// i18n[ColorPropertiesController.title=Color Properties]
  		String TITLE = s_stringMgr.getString("ColorPropertiesController.title");
  		
--- 45,49 ----
  
  	public static interface i18n {
! 		// i18n[ColorPropertiesController.title=Color]
  		String TITLE = s_stringMgr.getString("ColorPropertiesController.title");
  		

--- NEW FILE: ConnectionPropertiesPanel.java ---
package net.sourceforge.squirrel_sql.client.gui.db.aliasproperties;

/*
 * Copyright (C) 2009 Rob Manning
 * man...@us...
 * 
 * Based on initial work from Colin Bell
 *
 * 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.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.GridLayout;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.JTextArea;
import javax.swing.SpinnerNumberModel;

import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasConnectionProperties;
import net.sourceforge.squirrel_sql.fw.gui.MultipleLineLabel;
import net.sourceforge.squirrel_sql.fw.util.StringManager;
import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
import net.sourceforge.squirrel_sql.fw.util.Utilities;

/**
 * This panel allows the user to configure Session connection keep-alive properties
 */
public class ConnectionPropertiesPanel extends JPanel
{
	private static final long serialVersionUID = 1L;

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

	private JCheckBox enableConnectionKeepAliveChk = null;

	private JLabel sleepForLabel = null;

	private JSpinner sleepTime = null;

	private JLabel secondsLabel = null;

	private JLabel executeLabel = null;

	private JTextArea sqlTextArea = new JTextArea();

	public interface i18n
	{
		// i18n[ConnectionPropertiesPanel.enableKeepAliveMsg=Enable Keep-Alive]
		String ENABLE_KEEP_ALIVE_MSG = s_stringMgr.getString("ConnectionPropertiesPanel.enableKeepAliveMsg");		
		
		// i18n[ConnectionPropertiesPanel.instructions=These settings control whether or not...]
		String INSTRUCTIONS = s_stringMgr.getString("ConnectionPropertiesPanel.instructions");

		// i18n[ConnectionPropertiesPanel.secondsLabel=seconds]
		String SECONDS_LABEL = s_stringMgr.getString("ConnectionPropertiesPanel.secondsLabel");

		// i18n[ConnectionPropertiesPanel.executeLabel=Execute the following SQL statement:]
		String EXECUTE_LABEL = s_stringMgr.getString("ConnectionPropertiesPanel.executeLabel");

		// i18n[ConnectionPropertiesPanel.sleepForLabel=Sleep for]
		String SLEEP_FOR_LABEL = s_stringMgr.getString("ConnectionPropertiesPanel.sleepForLabel");

	}

	private SQLAliasConnectionProperties _props = null;

	public ConnectionPropertiesPanel(SQLAliasConnectionProperties props)
	{
		Utilities.checkNull("ConnectionPropertiesPanel.init", "props", props);

		this._props = props;

		createUserInterface();
		
		setSQLAliasConnectionProperties(props);
	}

	/**
	 * Retrieve the database properties.
	 * 
	 * @return the database properties.
	 */
	public SQLAliasConnectionProperties getSQLAliasConnectionProperties()
	{
		if (enableConnectionKeepAliveChk.isSelected())
		{
			_props.setEnableConnectionKeepAlive(true);
			int sleepTimeInt = (Integer)sleepTime.getValue();
			_props.setKeepAliveSleepTimeSeconds(sleepTimeInt);
			_props.setKeepAliveSqlStatement(sqlTextArea.getText());
		}
		else
		{
			_props.setEnableConnectionKeepAlive(false);
		}
		return _props;
	}

	public void setSQLAliasConnectionProperties(SQLAliasConnectionProperties props) {
		this._props = props;
		enableConnectionKeepAliveChk.setSelected(_props.isEnableConnectionKeepAlive());
		sleepForLabel.setEnabled(_props.isEnableConnectionKeepAlive());
		sleepTime.setEnabled(_props.isEnableConnectionKeepAlive());
		sleepTime.setValue(props.getKeepAliveSleepTimeSeconds());
		secondsLabel.setEnabled(_props.isEnableConnectionKeepAlive());
		executeLabel.setEnabled(_props.isEnableConnectionKeepAlive());
		sqlTextArea.setEnabled(_props.isEnableConnectionKeepAlive());
		sqlTextArea.setText(props.getKeepAliveSqlStatement());
	
	}
	
	private void createUserInterface()
	{
		setLayout(new GridBagLayout());

		final GridBagConstraints gbc = new GridBagConstraints();

		setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));

		gbc.anchor = GridBagConstraints.WEST;
		gbc.insets = new Insets(5, 5, 5, 5);
		gbc.fill = GridBagConstraints.HORIZONTAL;
		gbc.gridx = 0;
		gbc.gridy = 0;
		gbc.weightx = .75;
		gbc.weighty = .3;

		addInfoPanel(gbc);

		prepareNewRow(gbc);

		addMiddle(gbc);

		prepareNewRow(gbc);

		addExecuteLabel(gbc);

		prepareNewRow(gbc);

		addSqlTextAreaPanel(gbc);
		
		
	}

	private void addExecuteLabel(GridBagConstraints gbc)
	{
		executeLabel = new JLabel(i18n.EXECUTE_LABEL);
		// We want the text to line up with the text of the enable checkbox to give a hint that the
		// the checkbox controls enabling this component.
		Insets orig = gbc.insets;
		gbc.insets = new Insets(0, 25, 0, 0);
		add(executeLabel, gbc);
		gbc.insets = orig;
	}

	private void addInfoPanel(final GridBagConstraints gbc)
	{
		gbc.weighty = 0;
		gbc.fill = GridBagConstraints.BOTH;

		MultipleLineLabel label = new MultipleLineLabel(i18n.INSTRUCTIONS);

		// Instructions
		final JPanel pnl = new JPanel();
		pnl.add(new MultipleLineLabel(i18n.INSTRUCTIONS));

		add(label, gbc);

	}

	private void addMiddle(final GridBagConstraints gbc)
	{
		JPanel middlePanel = new JPanel();
		middlePanel.setLayout(new GridLayout(2, 1));
		
		setupEnabledCheckbox();
		middlePanel.add(enableConnectionKeepAliveChk);
		middlePanel.add(getSleepTimePanel());

		gbc.weightx = 1;
		gbc.gridwidth = 1;
		gbc.gridheight = 1;
		gbc.weighty = 0;
		gbc.fill = GridBagConstraints.HORIZONTAL;
		gbc.anchor = GridBagConstraints.WEST;

		add(middlePanel, gbc);
	}

	private JPanel getSleepTimePanel()
	{
		JPanel sleepTimePanel = new JPanel();
		sleepTimePanel.setLayout(new GridBagLayout());
		
		SpinnerNumberModel spinnerNumberModel = 
			new SpinnerNumberModel(_props.getKeepAliveSleepTimeSeconds(), 10, Integer.MAX_VALUE, 10);
		sleepTime = new JSpinner(spinnerNumberModel);
		sleepTime.setPreferredSize(new Dimension(75, 25));

		sleepForLabel = new JLabel(i18n.SLEEP_FOR_LABEL);
		
		GridBagConstraints gbc = new GridBagConstraints();
		gbc.anchor = GridBagConstraints.EAST;
		gbc.gridx = 0;
		gbc.gridy = 0;
		gbc.weightx = .05;
		gbc.insets = new Insets(0, 5, 0, 0);
		sleepTimePanel.add(sleepForLabel, gbc);

		gbc.anchor = GridBagConstraints.CENTER;
		gbc.gridx++;
		gbc.weightx = .05;
		sleepTimePanel.add(sleepTime, gbc);

		secondsLabel = new JLabel(i18n.SECONDS_LABEL);
		
		gbc.anchor = GridBagConstraints.WEST;
		gbc.gridx++;
		gbc.weightx = .9;
		sleepTimePanel.add(secondsLabel, gbc);

		return sleepTimePanel;
	}

	private void addSqlTextAreaPanel(final GridBagConstraints gbc)
	{
		gbc.weighty = .7;
		gbc.fill = GridBagConstraints.BOTH;
		gbc.insets = new Insets(10, 25, 10, 10);
		JPanel textPanel = new JPanel();
		textPanel.setLayout(new BorderLayout());
		textPanel.add(sqlTextArea, BorderLayout.CENTER);
		add(textPanel, gbc);
	}

	private void prepareNewRow(final GridBagConstraints gbc)
	{
		gbc.gridx = 0;
		++gbc.gridy;
		gbc.anchor = GridBagConstraints.WEST;
		gbc.gridwidth = 1;
		gbc.weighty = 0;
	}
	
	private void setupEnabledCheckbox()
	{		
		enableConnectionKeepAliveChk = new JCheckBox(i18n.ENABLE_KEEP_ALIVE_MSG);
		enableConnectionKeepAliveChk.addActionListener(new ActionListener()
		{

			@Override
			public void actionPerformed(ActionEvent e)
			{
				sleepForLabel.setEnabled(enableConnectionKeepAliveChk.isSelected());
				sleepTime.setEnabled(enableConnectionKeepAliveChk.isSelected());	
				secondsLabel.setEnabled(enableConnectionKeepAliveChk.isSelected());
				executeLabel.setEnabled(enableConnectionKeepAliveChk.isSelected());
				sqlTextArea.setEnabled(enableConnectionKeepAliveChk.isSelected());
			}
		});
	}

}

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/session SessionConnectionKeepAlive.java, NONE, 1.1 Session.java, 1.69, 1.70

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

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

Modified Files:
	Session.java 
Added Files:
	SessionConnectionKeepAlive.java 
Log Message:
Aliases now have the ability to setup keep-alive SQL statement and sleep time (in seconds) to prevent a connection from being disconnected while appearing to be idle.

Index: Session.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/Session.java,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** Session.java	13 Jul 2009 23:24:53 -0000	1.69
--- Session.java	19 Dec 2009 21:33:51 -0000	1.70
***************
*** 44,47 ****
--- 44,48 ----
  import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
  import net.sourceforge.squirrel_sql.client.gui.db.SQLAlias;
+ import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasConnectionProperties;
  import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.ISessionWidget;
  import net.sourceforge.squirrel_sql.client.gui.session.ObjectTreeInternalFrame;
***************
*** 59,63 ****
  import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
  import net.sourceforge.squirrel_sql.fw.persist.ValidationException;
! import net.sourceforge.squirrel_sql.fw.sql.*;
  import net.sourceforge.squirrel_sql.fw.util.DefaultExceptionFormatter;
  import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter;
--- 60,72 ----
  import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
  import net.sourceforge.squirrel_sql.fw.persist.ValidationException;
! import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
! import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
! import net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData;
! import net.sourceforge.squirrel_sql.fw.sql.ISQLDriver;
! import net.sourceforge.squirrel_sql.fw.sql.QueryTokenizer;
! import net.sourceforge.squirrel_sql.fw.sql.SQLConnection;
! import net.sourceforge.squirrel_sql.fw.sql.SQLConnectionState;
! import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
! import net.sourceforge.squirrel_sql.fw.sql.TokenizerSessPropsInteractions;
  import net.sourceforge.squirrel_sql.fw.util.DefaultExceptionFormatter;
  import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter;
***************
*** 152,155 ****
--- 161,166 ----
     private DefaultExceptionFormatter formatter = new DefaultExceptionFormatter();
     
+    private SessionConnectionKeepAlive _sessionConnectionKeepAlive = null;
+    
     /**
      * Create a new session.
***************
*** 231,237 ****
           }
        });
! 
     }
  
     /**
      * Close this session.
--- 242,267 ----
           }
        });
!       startKeepAliveTaskIfNecessary();
     }
  
+    private void startKeepAliveTaskIfNecessary() {
+       SQLAliasConnectionProperties connProps = _alias.getConnectionProperties();
+       
+       if (connProps.isEnableConnectionKeepAlive()) {
+       	String keepAliveSql = connProps.getKeepAliveSqlStatement();
+       	long sleepMillis = connProps.getKeepAliveSleepTimeSeconds() * 1000;
+       	_sessionConnectionKeepAlive = new SessionConnectionKeepAlive(_conn, sleepMillis, keepAliveSql, 
+       		_alias.getName());
+ 			_app.getThreadPool().addTask(_sessionConnectionKeepAlive,
+ 				"Session Connection Keep-Alive (" + _alias.getName() + ")");
+       }         	
+    }
+    
+    private void stopKeepAliveTaskIfNecessary() {
+    	if (_sessionConnectionKeepAlive != null) {
+    		_sessionConnectionKeepAlive.setStopped(true);
+    	}
+    }
+    
     /**
      * Close this session.
***************
*** 249,252 ****
--- 279,283 ----
        		s_log.debug("Closing session: " + _id);
        	}
+       	stopKeepAliveTaskIfNecessary();
           _conn.removePropertyChangeListener(_connLis);
           _connLis = null;
***************
*** 477,480 ****
--- 508,512 ----
        if (_conn != null)
        {
+       	stopKeepAliveTaskIfNecessary();
           try
           {
***************
*** 531,534 ****
--- 563,567 ----
           _msgHandler.showMessage(msg);
           _app.getSessionManager().fireReconnected(this);
+          startKeepAliveTaskIfNecessary();
        }
        catch (Throwable t)

--- NEW FILE: SessionConnectionKeepAlive.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.client.session;

import java.sql.Statement;

import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
import net.sourceforge.squirrel_sql.fw.sql.SQLUtilities;
import net.sourceforge.squirrel_sql.fw.util.Utilities;
import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;

/**
 * This class will loop continuously, pausing for a configurable amount of time and executing a configurable
 * SQL statement against a given SQLConnection.
 */
public class SessionConnectionKeepAlive implements Runnable
{
	/** Logger for this class. */
	private static final ILogger s_log = LoggerController.createLogger(SessionConnectionKeepAlive.class);

	private final long sleepMillis;

	private final ISQLConnection sqlConn;

	private final String sql;

	private volatile boolean isStopped = false;

	private final String aliasName;
	
	public SessionConnectionKeepAlive(ISQLConnection con, long sleepMillis, String sql, String aliasName)
	{
		if (sleepMillis < 1000) { 
			throw new IllegalArgumentException("Sleep time must be at least 1000ms(1 second)"); 
		}
		this.sleepMillis = sleepMillis;
		Utilities.checkNull("SessionConnectionKeepAlive", "con", con, "sql", sql);
		sqlConn = con;
		this.sql = sql;
		this.aliasName = aliasName;
	}

	public void setStopped(boolean isStopped)
	{
		this.isStopped = isStopped;
	}

	@Override
	public void run()
	{
		while (!isStopped)
		{
			Statement stmt = null;
			try
			{
				stmt = sqlConn.createStatement();
				if (s_log.isInfoEnabled()) {
					s_log.info("SessionConnectionKeepAlive ("+aliasName+") running SQL: "+sql);
				}
				stmt.executeQuery(sql);
			}
			catch (Throwable t)
			{
				s_log.error("run: unexpected exception while executing sql (" + sql + "): " + t.getMessage(), t);
			}
			finally
			{
				SQLUtilities.closeStatement(stmt);
			}
			// Always sleep at the end of the loop. In case we are stopped, we want to know that
			// immediately before executing the sql statement.
			Utilities.sleep(sleepMillis);
		}

	}

}

[Squirrel-sql-commits] sql12/test/mockobjects/net/sourceforge/squirrel_sql/fw/sql MockSQLAlias.java, 1.5, 1.6

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

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

Modified Files:
	MockSQLAlias.java 
Log Message:
Aliases now have the ability to setup keep-alive SQL statement and sleep time (in seconds) to prevent a connection from being disconnected while appearing to be idle.

Index: MockSQLAlias.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/mockobjects/net/sourceforge/squirrel_sql/fw/sql/MockSQLAlias.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MockSQLAlias.java	28 Nov 2009 20:33:55 -0000	1.5
--- MockSQLAlias.java	19 Dec 2009 21:33:51 -0000	1.6
***************
*** 25,28 ****
--- 25,29 ----
  import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
  import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasColorProperties;
+ import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasConnectionProperties;
  import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasSchemaProperties;
  
***************
*** 189,191 ****
--- 190,206 ----
  		
  	}
+ 
+ 	@Override
+ 	public SQLAliasConnectionProperties getConnectionProperties()
+ 	{
+ 		// TODO Auto-generated method stub
+ 		return null;
+ 	}
+ 
+ 	@Override
+ 	public void setConnectionProperties(SQLAliasConnectionProperties connectionProperties)
+ 	{
+ 		// TODO Auto-generated method stub
+ 		
+ 	}
  }

[Squirrel-sql-commits] sql12/test/jfctests/net/sourceforge/squirrel_sql/client/gui/db ConnectionPropertiesPanelTestUI.java, NONE, 1.1

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

Update of /cvsroot/squirrel-sql/sql12/test/jfctests/net/sourceforge/squirrel_sql/client/gui/db
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1839/test/jfctests/net/sourceforge/squirrel_sql/client/gui/db

Added Files:
	ConnectionPropertiesPanelTestUI.java 
Log Message:
Aliases now have the ability to setup keep-alive SQL statement and sleep time (in seconds) to prevent a connection from being disconnected while appearing to be idle.

--- NEW FILE: ConnectionPropertiesPanelTestUI.java ---
package net.sourceforge.squirrel_sql.client.gui.db;

import javax.swing.JFrame;

import net.sourceforge.squirrel_sql.client.ApplicationArguments;
import net.sourceforge.squirrel_sql.client.gui.db.aliasproperties.ConnectionPropertiesPanel;

public class ConnectionPropertiesPanelTestUI {

	
	
    /**
     * @param args
     */
    public static void main(String[] args) {
        ApplicationArguments.initialize(new String[] {});
        
        
        final JFrame frame = new JFrame("Test ConnectionPropertiesPanel");

        SQLAliasConnectionProperties props = new SQLAliasConnectionProperties();
        
        ConnectionPropertiesPanel panel = new ConnectionPropertiesPanel(props);
        
        frame.getContentPane().add(panel);
        frame.setSize(500,300);
        frame.setVisible(true);
        
        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

    }

}

[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db SQLAliasConnectionProperties.java, NONE, 1.1 ISQLAliasExt.java, 1.2, 1.3 SQLAlias.java, 1.8, 1.9 SQLAliasBeanInfo.java, 1.5, 1.6

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

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1839/app/src/net/sourceforge/squirrel_sql/client/gui/db

Modified Files:
	ISQLAliasExt.java SQLAlias.java SQLAliasBeanInfo.java 
Added Files:
	SQLAliasConnectionProperties.java 
Log Message:
Aliases now have the ability to setup keep-alive SQL statement and sleep time (in seconds) to prevent a connection from being disconnected while appearing to be idle.

Index: SQLAliasBeanInfo.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/SQLAliasBeanInfo.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SQLAliasBeanInfo.java	28 Nov 2009 20:14:51 -0000	1.5
--- SQLAliasBeanInfo.java	19 Dec 2009 21:33:51 -0000	1.6
***************
*** 69,73 ****
  							"setSchemaProperties"),
  						new PropertyDescriptor(IPropNames.COLOR_PROPERTIES, SQLAlias.class, "getColorProperties",
! 							"setColorProperties") };
  			return result;
  		}
--- 69,75 ----
  							"setSchemaProperties"),
  						new PropertyDescriptor(IPropNames.COLOR_PROPERTIES, SQLAlias.class, "getColorProperties",
! 							"setColorProperties"),
! 							new PropertyDescriptor(IPropNames.CONNECTION_PROPERTIES, SQLAlias.class, "getConnectionProperties",
! 							"setConnectionProperties")};
  			return result;
  		}

--- NEW FILE: SQLAliasConnectionProperties.java ---
package net.sourceforge.squirrel_sql.client.gui.db;

/*
 * Copyright (C) 2009 Rob Manning
 * man...@us...
 * 
 * Based on initial work from Colin Bell
 *
 * 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.io.Serializable;

public class SQLAliasConnectionProperties implements Serializable
{
   private static final long serialVersionUID = 1L;

   /** Whether or not to enable connection keep alives */
   private boolean enableConnectionKeepAlive = false;
   
   /** time between executing the keep alive sql statement;  Default = 2 minutes */
   private int keepAliveSleepTimeSeconds = 120;
   
   /** the statement to execute to keep the connection alive */
   private String keepAliveSqlStatement = "";
      
   /**
	 * @return the isEnableConnectionKeepAlive
	 */
	public boolean isEnableConnectionKeepAlive()
	{
		return enableConnectionKeepAlive;
	}

	/**
	 * @param enableConnectionKeepAlive the enableConnectionKeepAlive to set
	 */
	public void setEnableConnectionKeepAlive(boolean enableConnectionKeepAlive)
	{
		this.enableConnectionKeepAlive = enableConnectionKeepAlive;
	}

	/**
	 * @return the keepAliveSleepTimeSeconds
	 */
	public int getKeepAliveSleepTimeSeconds()
	{
		return keepAliveSleepTimeSeconds;
	}

	/**
	 * @param keepAliveSleepTimeMillis the keepAliveSleepTimeSeconds to set
	 */
	public void setKeepAliveSleepTimeSeconds(int keepAliveSleepTimeSeconds)
	{
		this.keepAliveSleepTimeSeconds = keepAliveSleepTimeSeconds;
	}

	/**
	 * @return the keepAliveSqlStatement
	 */
	public String getKeepAliveSqlStatement()
	{
		return keepAliveSqlStatement;
	}

	/**
	 * @param keepAliveSqlStatement the keepAliveSqlStatement to set
	 */
	public void setKeepAliveSqlStatement(String keepAliveSqlStatement)
	{
		this.keepAliveSqlStatement = keepAliveSqlStatement;
	}   
   
}

Index: SQLAlias.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/SQLAlias.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SQLAlias.java	28 Nov 2009 20:14:51 -0000	1.8
--- SQLAlias.java	19 Dec 2009 21:33:51 -0000	1.9
***************
*** 98,101 ****
--- 98,103 ----
     private SQLAliasColorProperties _colorProperties = new SQLAliasColorProperties();
     
+    private SQLAliasConnectionProperties _connectionProperties = new SQLAliasConnectionProperties();
+    
     /**
      * Default ctor.
***************
*** 153,156 ****
--- 155,164 ----
        _colorProperties = 
        	(SQLAliasColorProperties) Utilities.cloneObject(rhs._colorProperties, getClass().getClassLoader());
+       
+       _connectionProperties = new SQLAliasConnectionProperties();
+       SQLAliasConnectionProperties rhsConnProps = rhs.getConnectionProperties();
+ 		_connectionProperties.setEnableConnectionKeepAlive(rhsConnProps.isEnableConnectionKeepAlive());
+ 		_connectionProperties.setKeepAliveSleepTimeSeconds(rhsConnProps.getKeepAliveSleepTimeSeconds());
+ 		_connectionProperties.setKeepAliveSqlStatement(rhsConnProps.getKeepAliveSqlStatement());
     }
  
***************
*** 170,192 ****
     }
  
- //   /**
- //    * Return a clone of this object.
- //    */
- //   public Object clone()
- //   {
- //      try
- //      {
- //         final SQLAlias alias = (SQLAlias)super.clone();
- //         alias._propChgReporter = null;
- //         alias.setDriverProperties(getDriverPropertiesClone());
- //         alias._schemaProperties = (SQLAliasSchemaProperties) Utilities.cloneObject(alias._schemaProperties, getClass().getClassLoader());
- //         return alias;
- //      }
- //      catch (CloneNotSupportedException ex)
- //      {
- //         throw new InternalError(ex.getMessage()); // Impossible.
- //      }
- //   }
- 
     /**
      * Returns a hash code value for this object.
--- 178,181 ----
***************
*** 507,509 ****
--- 496,510 ----
  	}
  
+ 	@Override
+ 	public SQLAliasConnectionProperties getConnectionProperties()
+ 	{
+ 		return _connectionProperties;
+ 	}
+ 
+ 	@Override
+ 	public void setConnectionProperties(SQLAliasConnectionProperties connectionProperties)
+ 	{
+ 		_connectionProperties = connectionProperties;
+ 	}
+ 
  }

Index: ISQLAliasExt.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/db/ISQLAliasExt.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ISQLAliasExt.java	28 Nov 2009 20:14:51 -0000	1.2
--- ISQLAliasExt.java	19 Dec 2009 21:33:51 -0000	1.3
***************
*** 10,12 ****
--- 10,16 ----
     SQLAliasColorProperties getColorProperties();
     void setColorProperties(SQLAliasColorProperties colorProperties);
+    
+    SQLAliasConnectionProperties getConnectionProperties();
+    void setConnectionProperties(SQLAliasConnectionProperties connectionProperties);
+    
  }

[Squirrel-sql-commits] sql12/test/src/net/sourceforge/squirrel_sql/client/gui/session SessionPanelTest.java, 1.2, 1.3

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

Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client/gui/session
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14878/test/src/net/sourceforge/squirrel_sql/client/gui/session

Modified Files:
	SessionPanelTest.java 
Log Message:
Fixed test that was failing due to new Color properties bean.

Index: SessionPanelTest.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/client/gui/session/SessionPanelTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SessionPanelTest.java	29 Dec 2008 16:59:10 -0000	1.2
--- SessionPanelTest.java	16 Dec 2009 20:41:09 -0000	1.3
***************
*** 29,32 ****
--- 29,34 ----
  import net.sourceforge.squirrel_sql.client.IApplication;
  import net.sourceforge.squirrel_sql.client.gui.builders.UIFactory;
+ import net.sourceforge.squirrel_sql.client.gui.db.ISQLAliasExt;
+ import net.sourceforge.squirrel_sql.client.gui.db.SQLAliasColorProperties;
  import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
  import net.sourceforge.squirrel_sql.client.resources.SquirrelResources;
***************
*** 53,64 ****
--- 55,71 ----
  	ImageIcon mockImageIcon = mockHelper.createMock(ImageIcon.class);
  	IMainPanelFactory mockMainPanelFactory = mockHelper.createMock(IMainPanelFactory.class);
+ 	ISQLAliasExt mockAlias = mockHelper.createMock(ISQLAliasExt.class);
+ 	SQLAliasColorProperties mockColorProps = 
+ 		mockHelper.createMock(SQLAliasColorProperties.class);
  	
  	@Before
  	public void setUp() throws Exception
  	{
+ 		 
  		// mockSession
  		expect(mockSession.getApplication()).andStubReturn(mockApplication);
  		expect(mockSession.getIdentifier()).andStubReturn(mockIdentifier);
  		expect(mockSession.getProperties()).andStubReturn(mockSessionProperties);
+ 		expect(mockSession.getAlias()).andStubReturn(mockAlias);
  		
  		// mockPreferences
***************
*** 77,80 ****
--- 84,95 ----
  		expect(mockSquirrelResources.getIcon(EasyMock.isA(String.class))).andStubReturn(mockImageIcon);
  		
+ 		// mockAlias
+ 		expect(mockAlias.getColorProperties()).andStubReturn(mockColorProps);
+ 		
+ 		// mockColorProps
+ 		expect(mockColorProps.isOverrideObjectTreeBackgroundColor()).andStubReturn(false);
+ 		expect(mockColorProps.isOverrideStatusBarBackgroundColor()).andStubReturn(false);
+ 		expect(mockColorProps.isOverrideToolbarBackgroundColor()).andStubReturn(false);
+ 		
  		mockHelper.replayAll();
  		UIFactory.initialize(mockPreferences, mockApplication);