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

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6460] trunk/sql12

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

Revision: 6460
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6460&view=rev
Author:   gerdwagner
Date:     2011-10-09 14:55:13 +0000 (Sun, 09 Oct 2011)
Log Message:
-----------
Hibernate Plugin:
 Fixed several bugs in the HQL results reading function concerning lazy loaded non collection attributes.
Hibernate Plugin:
  HQL errors during results reading are now displayed as a result tab. (Similar to the new SQL error display.)

Modified Paths:
--------------
    trunk/sql12/doc/src/main/resources/changes.txt
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLPanelController.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreatorListener.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/WaitPanel.java
    trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/I18NStrings.properties

Added Paths:
-----------
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateProxyHandler.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java
    trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/WaitPanelListener.java

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2011-10-09 14:55:13 UTC (rev 6460)
@@ -7,6 +7,9 @@
 
 Enhancements:
 
+Hibernate Plugin:
+  HQL errors during results reading are now displayed as a result tab. (Similar to the new SQL error display.)
+
 Some performance improvements, when searching in the object tree. 
 	Now, Squirrel will not try to expand a node twice, if no children were found for a node at a previous search. 
 
@@ -123,6 +126,9 @@
 Bug-fixes:
 
 
+Hibernate Plugin:
+ Fixed several bugs in the HQL results reading function concerning lazy loaded non collection attributes.
+
 3408086: Non ASCII characters are highlighted as as invalid characters at the SQL-Editor pane. 
 
 SQLScripts plugin:

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLPanelController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLPanelController.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HQLPanelController.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -1,14 +1,13 @@
 package net.sourceforge.squirrel_sql.plugins.hibernate;
 
 import net.sourceforge.squirrel_sql.client.session.ISession;
-import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter;
 import net.sourceforge.squirrel_sql.fw.util.StringManager;
 import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
-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;
 import net.sourceforge.squirrel_sql.fw.sql.IQueryTokenizer;
 import net.sourceforge.squirrel_sql.fw.sql.QueryTokenizer;
+import net.sourceforge.squirrel_sql.plugins.hibernate.util.HqlQueryErrorUtil;
 
 import javax.swing.*;
 import java.awt.*;
@@ -18,8 +17,7 @@
 
 public class HQLPanelController
 {
-   private static final StringManager s_stringMgr =
-      StringManagerFactory.getStringManager(HQLPanelController.class);
+   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(HQLPanelController.class);
 
    private static ILogger s_log = LoggerController.createLogger(HQLPanelController.class);
 
@@ -71,51 +69,39 @@
 
    private void onRunHQL()
    {
-      try
+      if (false == _runHQL.isEnabled())
       {
-         if (false == _runHQL.isEnabled())
-         {
-            return;
-         }
+         return;
+      }
 
-         String hql = _hqlEntryPanelManager.getEntryPanel().getSQLToBeExecuted();
+      String hql = _hqlEntryPanelManager.getEntryPanel().getSQLToBeExecuted();
 
-         if (null == hql || 0 == hql.trim().length())
-         {
-            return;
-         }
+      if (null == hql || 0 == hql.trim().length())
+      {
+         return;
+      }
 
-         final IQueryTokenizer queryTokenizer = _sess.getQueryTokenizer();
-         final String statementSeparator = queryTokenizer.getSQLStatementSeparator();
-         final String startOfLineComment = queryTokenizer.getLineCommentBegin();
-         QueryTokenizer qt = new QueryTokenizer(statementSeparator, startOfLineComment, true);
-         qt.setScriptToTokenize(hql);
+      final IQueryTokenizer queryTokenizer = _sess.getQueryTokenizer();
+      final String statementSeparator = queryTokenizer.getSQLStatementSeparator();
+      final String startOfLineComment = queryTokenizer.getLineCommentBegin();
+      QueryTokenizer qt = new QueryTokenizer(statementSeparator, startOfLineComment, true);
+      qt.setScriptToTokenize(hql);
 
 
-         while(qt.hasQuery())
-         {
-            String hqlQuery = qt.nextQuery();
-            if(false == doSQL(hqlQuery))
-            {
-               continue;
-            }
+      while (qt.hasQuery())
+      {
+         String hqlQuery = qt.nextQuery();
+         doSQL(hqlQuery);
 
-            if (_hibernateTabController.isDisplayObjects())
-            {
-               doObjects(hqlQuery);
-            }
+         if (_hibernateTabController.isDisplayObjects())
+         {
+            doObjects(hqlQuery);
          }
-
       }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
    }
 
 
    private boolean doSQL(String hqlQuery)
-      throws Exception
    {
       ArrayList<String> sqls;
 
@@ -132,26 +118,14 @@
          _sess.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("SQLPanelController.hqlToSqlSuccess", sqls.size(), duration));
          return true;
       }
-      catch (Exception e)
+      catch (Throwable e)
       {
-         Throwable t = Utilities.getDeepestThrowable(e);
-         ExceptionFormatter formatter = _sess.getExceptionFormatter();
-         String message = formatter.format(t);
-         _sess.showErrorMessage(message);
-
-         if (_sess.getProperties().getWriteSQLErrorsToLog() ||
-            (-1 == t.getClass().getName().toLowerCase().indexOf("hibernate") && -1 == t.getClass().getName().toLowerCase().indexOf("antlr")))
-         {
-            // If this is not a hibernate error we write a log entry
-            s_log.error(t);
-         }
-
+         HqlQueryErrorUtil.handleHqlQueryError(e, _sess, true);
          return false;
       }
    }
 
-   private void doObjects(String hqlQuery) 
-      throws Exception
+   private void doObjects(String hqlQuery)
    {
       _hibernateTabController.displayObjects(_con, hqlQuery);
    }

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/HibernateConnection.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -3,10 +3,7 @@
 import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
 import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
-import net.sourceforge.squirrel_sql.plugins.hibernate.server.HibernateServerConnection;
-import net.sourceforge.squirrel_sql.plugins.hibernate.server.HibernateSqlConnectionData;
-import net.sourceforge.squirrel_sql.plugins.hibernate.server.MappedClassInfoData;
-import net.sourceforge.squirrel_sql.plugins.hibernate.server.ServerMain;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.*;
 
 import java.rmi.RMISecurityManager;
 import java.rmi.RemoteException;
@@ -179,7 +176,7 @@
       }
    }
 
-   public List createQueryList(String hqlQuery, int sqlNbrRowsToShow)
+   public HqlQueryResult createQueryList(String hqlQuery, int sqlNbrRowsToShow)
    {
       try
       {

Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateProxyHandler.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateProxyHandler.java	                        (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateProxyHandler.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -0,0 +1,93 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.HashSet;
+
+
+/**
+ * Needed to remove lazy loading non collection proxies. These proxies caused serialization
+ * problems when transferred from the external hibernate process.
+ */
+public class HibernateProxyHandler
+{
+   private ClassLoader _cl;
+   private ReflectionCaller _rc;
+
+   public HibernateProxyHandler(ClassLoader cl)
+   {
+      _cl = cl;
+      _rc = new ReflectionCaller();
+   }
+
+
+   public void prepareHibernateProxies(Collection col, HashSet<String> mappedClassNames)
+   {
+      HashSet doneObjs = new HashSet();
+      _prepareHibernateProxiesForCollection(col, mappedClassNames, doneObjs, true);
+   }
+
+   private void _prepareHibernateProxiesForCollection(Collection col, HashSet<String> mappedClassNames, HashSet doneObjs, boolean isQueryList)
+   {
+      try
+      {
+         if (null == col)
+         {
+            return;
+         }
+
+         boolean isInitialized = isQueryList ||
+               (Boolean) _rc.callStaticMethod(_cl, "org.hibernate.Hibernate", "isInitialized", new Class[]{Object.class}, new Object[]{col}).getCallee();
+
+         if (isInitialized)
+         {
+            for (Object o : col)
+            {
+               _prepareHibernateProxies(o, mappedClassNames, doneObjs);
+            }
+         }
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   private void _prepareHibernateProxies(Object o, HashSet<String> mappedClassNames, HashSet doneObjs) throws IllegalAccessException
+   {
+      if (null == o || doneObjs.contains(o))
+      {
+         return;
+      }
+
+      doneObjs.add(o);
+
+      Field[] declaredFields = o.getClass().getDeclaredFields();
+
+      for (Field declaredField : declaredFields)
+      {
+         if (mappedClassNames.contains(declaredField.getType().getName()))
+         {
+            declaredField.setAccessible(true);
+            Object fielddObj = declaredField.get(o);
+            if (null != fielddObj)
+            {
+               if (-1 < fielddObj.getClass().getName().indexOf('$'))
+               {
+                  declaredField.set(o, null);
+               }
+               else
+               {
+                  _prepareHibernateProxies(fielddObj, mappedClassNames, doneObjs);
+               }
+            }
+         }
+         else if (Collection.class.isAssignableFrom(declaredField.getType()))
+         {
+            declaredField.setAccessible(true);
+            Object fielddObj = declaredField.get(o);
+            _prepareHibernateProxiesForCollection((Collection) fielddObj, mappedClassNames, doneObjs, false);
+         }
+      }
+   }
+}

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnection.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -25,7 +25,7 @@
          throws RemoteException;
 
 
-   List createQueryList(String hqlQuery, int sqlNbrRowsToShow)
+   HqlQueryResult createQueryList(String hqlQuery, int sqlNbrRowsToShow)
          throws RemoteException;
 
 }

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HibernateServerConnectionImpl.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -1,6 +1,5 @@
 package net.sourceforge.squirrel_sql.plugins.hibernate.server;
 
-import java.net.URLClassLoader;
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -13,6 +12,7 @@
    private ClassLoader _cl;
    private ArrayList<MappedClassInfoData> _mappedClassInfoData;
    private ReflectionCaller m_rcHibernateSession;
+   private HashSet<String> _mappedClassNames;
 
 
    HibernateServerConnectionImpl(Object sessionFactoryImpl, ClassLoader cl) throws RemoteException
@@ -114,6 +114,7 @@
       }
 
       _mappedClassInfoData = new ArrayList<MappedClassInfoData>();
+      _mappedClassNames =  new HashSet<String>();
 
       ReflectionCaller sessionFactoryImplcaller = new ReflectionCaller(_sessionFactoryImpl);
       Collection<ReflectionCaller> persisters = sessionFactoryImplcaller.callMethod("getAllClassMetadata").callCollectionMethod("values");
@@ -175,6 +176,7 @@
             }
          }
          _mappedClassInfoData.add(new MappedClassInfoData(mappedClass.getName(), tableName, identifierPropInfo, infos));
+         _mappedClassNames.add(mappedClass.getName());
       }
    }
 
@@ -195,18 +197,62 @@
    }
 
    @Override
-   public List createQueryList(String hqlQuery, int sqlNbrRowsToShow)
+   public HqlQueryResult createQueryList(String hqlQuery, int sqlNbrRowsToShow)
    {
-      ReflectionCaller  rc = getRcHibernateSession().callMethod("createQuery", hqlQuery);
+      HqlQueryResult ret = new HqlQueryResult();
 
-      if (0 <= sqlNbrRowsToShow)
+      try
       {
-         rc = rc.callMethod("setMaxResults", new RCParam().add(sqlNbrRowsToShow, Integer.TYPE));
+         getRcHibernateSession().callMethod("getTransaction").callMethod("begin");
       }
+      catch (Throwable t)
+      {
+         ret.putSessionAdminException("Exception occurced during call of Session.getTransaction().begin()", t);
+      }
 
-      return (List) rc.callMethod("list").getCallee();
+      try
+      {
+         ReflectionCaller rc = getRcHibernateSession().callMethod("createQuery", hqlQuery);
+
+         if (0 <= sqlNbrRowsToShow)
+         {
+            rc = rc.callMethod("setMaxResults", new RCParam().add(sqlNbrRowsToShow, Integer.TYPE));
+         }
+
+         ret.setQueryResultList((List) rc.callMethod("list").getCallee());
+      }
+      catch (Throwable t)
+      {
+         ret.setExceptionOccuredWhenExecutingQuery(t);
+      }
+
+      try
+      {
+         getRcHibernateSession().callMethod("getTransaction").callMethod("rollback");
+      }
+      catch (Throwable t)
+      {
+         ret.putSessionAdminException("Exception occurced during call of Session.getTransaction().rollback()", t);
+      }
+
+      try
+      {
+         getRcHibernateSession().callMethod("clear");
+      }
+      catch (Throwable t)
+      {
+         ret.putSessionAdminException("Exception occurced during call of Session.clear()", t);
+      }
+
+       if (null != ret.getQueryResultList())
+       {
+           new HibernateProxyHandler(_cl).prepareHibernateProxies(ret.getQueryResultList(), _mappedClassNames);
+       }
+
+       return ret;
    }
 
+
    private ReflectionCaller getRcHibernateSession()
    {
       if(null == m_rcHibernateSession)

Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java	                        (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/HqlQueryResult.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -0,0 +1,43 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.server;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+
+public class HqlQueryResult implements Serializable
+{
+   private List _queryResultList;
+   private Throwable _exceptionOccuredWhenExecutingQuery;
+
+   private HashMap<String, Throwable> _sessionAdminExceptions = new HashMap<String, Throwable>();
+
+   public void putSessionAdminException(String msgKey, Throwable t)
+   {
+      _sessionAdminExceptions.put(msgKey, t);
+   }
+
+   public void setQueryResultList(List list)
+   {
+      _queryResultList = list;
+   }
+
+   public List getQueryResultList()
+   {
+      return _queryResultList;
+   }
+
+   public void setExceptionOccuredWhenExecutingQuery(Throwable exceptionOccuredWhenExecutingQuery)
+   {
+      _exceptionOccuredWhenExecutingQuery = exceptionOccuredWhenExecutingQuery;
+   }
+
+   public Throwable getExceptionOccuredWhenExecutingQuery()
+   {
+      return _exceptionOccuredWhenExecutingQuery;
+   }
+
+   public HashMap<String, Throwable> getSessionAdminExceptions()
+   {
+      return _sessionAdminExceptions;
+   }
+}

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/server/ReflectionCaller.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -205,4 +205,20 @@
 
    }
 
+   public ReflectionCaller callStaticMethod(ClassLoader cl, String className, String methName, Class[] paramTypes, Object[] args)
+   {
+      try
+      {
+         Class<?> clazz = cl.loadClass(className);
+         Method method = clazz.getDeclaredMethod(methName, paramTypes);
+         method.setAccessible(true);
+         return new ReflectionCaller(method.invoke(clazz, args));
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+
 }

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HibernateUtil.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -49,10 +49,12 @@
 
 	/** factory for creating FileWrappers which insulate the application from direct reference to File */
 	private static FileWrapperFactory fileWrapperFactory = new FileWrapperFactoryImpl();
-   
-	
-	private static IOUtilities ioutils = new IOUtilitiesImpl();
-   
+
+
+   private static IOUtilities ioutils = new IOUtilitiesImpl();
+   public static final String OBJECT_IS_NULL = "<object is null>";
+   public static final String UNITIALIZED_PERSISTENT_COLLECTION = "<unitialized persistent collection>";
+
    public static XMLBeanReader createHibernateConfigsReader(HibernatePlugin plugin)
          throws IOException, XMLException
    {

Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java	                        (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/util/HqlQueryErrorUtil.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -0,0 +1,44 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.util;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.util.ExceptionFormatter;
+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;
+import net.sourceforge.squirrel_sql.plugins.hibernate.HQLPanelController;
+
+public class HqlQueryErrorUtil
+{
+   private static ILogger s_log = LoggerController.createLogger(HqlQueryErrorUtil.class);
+
+
+   public static String handleHqlQueryError(Throwable e, ISession sess, boolean showInMessagePanel)
+   {
+      String ret = null;
+
+      Throwable t = Utilities.getDeepestThrowable(e);
+      ExceptionFormatter formatter = sess.getExceptionFormatter();
+      try
+      {
+         ret = formatter.format(t);
+         if (showInMessagePanel)
+         {
+            sess.showErrorMessage(ret);
+         }
+      }
+      catch (Exception e1)
+      {
+         sess.showErrorMessage(e1);
+         sess.showErrorMessage(t);
+      }
+
+      if (sess.getProperties().getWriteSQLErrorsToLog() ||
+            (-1 == t.getClass().getName().toLowerCase().indexOf("hibernate") && -1 == t.getClass().getName().toLowerCase().indexOf("antlr")))
+      {
+         // If this is not a hibernate error we write a log entry
+         s_log.error(t);
+      }
+
+      return ret;
+   }
+}

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/HibernatePropertyReader.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -1,5 +1,6 @@
 package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;
 
+import net.sourceforge.squirrel_sql.plugins.hibernate.util.HibernateUtil;
 import net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects.PropertyAccessor;
 
 import java.lang.reflect.Field;
@@ -15,7 +16,10 @@
    {
       _propertyName = propertyName;
       _obj = obj;
-      _propertyAccessor = getAccessor(_obj.getClass());
+      if (null != obj)
+      {
+         _propertyAccessor = getAccessor(_obj.getClass());
+      }
    }
 
    public String getName()
@@ -28,7 +32,14 @@
    {
       try
       {
-         return _propertyAccessor.get(_obj);
+         if (null == _propertyAccessor)
+         {
+            return HibernateUtil.OBJECT_IS_NULL;
+         }
+         else
+         {
+            return _propertyAccessor.get(_obj);
+         }
       }
       catch (Exception e)
       {
@@ -86,13 +97,15 @@
 
    public String getTypeName()
    {
-      return _propertyAccessor.getType().getName();
+      if (null == _propertyAccessor)
+      {
+         return HibernateUtil.OBJECT_IS_NULL;
+      }
+      else
+      {
+         return _propertyAccessor.getType().getName();
+      }
    }
 
-   public Class getType()
-   {
-      return _propertyAccessor.getType();
-   }
 
-
 }

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ObjectResultController.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -49,34 +49,49 @@
       QueryListCreatorListener queryListCreatorListener = new QueryListCreatorListener()
       {
          @Override
-         public void listRead(QueryListCreator queryListCreator)
+         public void queryExecuted(QueryListCreator queryListCreator)
          {
-            onListRead(queryListCreator);
+            onQueryExecuted(queryListCreator);
          }
       };
 
-      WaitPanel waitPanel = new WaitPanel(hqlQuery);
+      WaitPanelListener waitPanelListener = new WaitPanelListener()
+      {
+         @Override
+         public void removeWaitPanel(WaitPanel waitPanel)
+         {
+            onCloseTab(waitPanel);
+         }
+      };
+
+      WaitPanel waitPanel = new WaitPanel(hqlQuery, _resource, waitPanelListener);
       _objectResultTabbedPane.addTab(waitPanel.getTitle(), waitPanel);
       _objectResultTabbedPane.setSelectedComponent(waitPanel);
       new QueryListCreator(queryListCreatorListener, hqlQuery, maxNumResults, con, _session, waitPanel).execute();
 
    }
 
-   private void onListRead(QueryListCreator queryListCreator)
+   private void onQueryExecuted(QueryListCreator queryListCreator)
    {
+      removeOldErrorPanel(queryListCreator.getWaitPanel());
 
+      if (queryListCreator.getWaitPanel().isDisplayingError())
+      {
+         return;
+      }
+
       for (int i = 0; i < _objectResultTabbedPane.getTabCount(); i++)
       {
-         if(_objectResultTabbedPane.getComponentAt(i) == queryListCreator.getWaitPanel())
+         if (_objectResultTabbedPane.getComponentAt(i) == queryListCreator.getWaitPanel())
          {
             _objectResultTabbedPane.removeTabAt(i);
             break;
          }
       }
-         
+
       List list = queryListCreator.getList();
 
-      if(null == list)
+      if (null == list)
       {
          return;
       }
@@ -86,7 +101,7 @@
          @Override
          public void closeTab(ObjectResultTabController toClose)
          {
-            onCloseTab(toClose);
+            onCloseTab(toClose.getPanel());
          }
       };
 
@@ -102,12 +117,26 @@
       _objectResultTabbedPane.setSelectedComponent(ortc.getPanel());
    }
 
+   private void removeOldErrorPanel(WaitPanel currentWaitPanel)
+   {
+      for (int i = 0; i < _objectResultTabbedPane.getTabCount(); i++)
+      {
+         if (currentWaitPanel != _objectResultTabbedPane.getComponentAt(i)
+               && _objectResultTabbedPane.getComponentAt(i) instanceof WaitPanel
+               && ((WaitPanel) _objectResultTabbedPane.getComponentAt(i)).isDisplayingError())
+         {
+            _objectResultTabbedPane.removeTabAt(i);
+            break;
+         }
+      }
+   }
 
-   private void onCloseTab(ObjectResultTabController toClose)
+
+   private void onCloseTab(JPanel panel)
    {
       for (int i = 0; i < _objectResultTabbedPane.getTabCount(); i++)
       {
-         if(_objectResultTabbedPane.getComponentAt(i) == toClose.getPanel())
+         if(_objectResultTabbedPane.getComponentAt(i) == panel)
          {
             _objectResultTabbedPane.removeTabAt(i);
             break;

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreator.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -8,14 +8,16 @@
 import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
 import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
 import net.sourceforge.squirrel_sql.plugins.hibernate.HibernateConnection;
+import net.sourceforge.squirrel_sql.plugins.hibernate.server.HqlQueryResult;
+import net.sourceforge.squirrel_sql.plugins.hibernate.util.HqlQueryErrorUtil;
 
 import javax.swing.*;
 import java.util.List;
 
-public class QueryListCreator extends SwingWorker
+public class QueryListCreator extends SwingWorker<HqlQueryResult, Object>
 {
 
-   private static ILogger s_log = LoggerController.createLogger(ObjectResultController.class);
+   private static ILogger s_log = LoggerController.createLogger(QueryListCreator.class);
    private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(QueryListCreator.class);
 
 
@@ -26,7 +28,7 @@
    private ISession _session;
    private WaitPanel _waitPanel;
    private volatile long _duration;
-   private List _list;
+   private HqlQueryResult _hqlQueryResult;
 
    public QueryListCreator(QueryListCreatorListener queryListCreatorListener,
                            String hqlQuery,
@@ -44,12 +46,13 @@
    }
 
    @Override
-   protected Object doInBackground() throws Exception
+   protected HqlQueryResult doInBackground()
    {
+      // Note: if an exception occurs here it will be thrown from the call to get() in method done() below.
       long begin = System.currentTimeMillis();
-      List ret = _con.createQueryList(_hqlQuery, _maxNumResults);
+      HqlQueryResult queryRes = _con.createQueryList(_hqlQuery, _maxNumResults);
       _duration = System.currentTimeMillis() - begin;
-      return ret;
+      return queryRes;
    }
 
 
@@ -58,39 +61,43 @@
    {
       try
       {
-         _list = (List) get();
-         _session.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("ObjectResultController.hqlReadObjectsSuccess", _list.size(), _duration));
-      }
-      catch (Exception e)
-      {
-         Throwable t = Utilities.getDeepestThrowable(e);
-         ExceptionFormatter formatter = _session.getExceptionFormatter();
-         try
+         _hqlQueryResult = get();
+
+         for (String msgKey : _hqlQueryResult.getSessionAdminExceptions().keySet())
          {
-            String message = formatter.format(t);
-            _session.showErrorMessage(message);
+            s_log.error(msgKey, _hqlQueryResult.getSessionAdminExceptions().get(msgKey));
          }
-         catch (Exception e1)
+
+         if (null != _hqlQueryResult.getExceptionOccuredWhenExecutingQuery())
          {
-            _session.showErrorMessage(e1);
-            _session.showErrorMessage(t);
+            // Maybe this error should be displayed as an error result tab like it is done for SQL errors.
+            _waitPanel.displayHqlQueryError(HqlQueryErrorUtil.handleHqlQueryError(_hqlQueryResult.getExceptionOccuredWhenExecutingQuery(), _session, false));
+            return;
          }
 
-         if (_session.getProperties().getWriteSQLErrorsToLog() ||
-            (-1 == t.getClass().getName().toLowerCase().indexOf("hibernate") && -1 == t.getClass().getName().toLowerCase().indexOf("antlr")))
+         if (null == _hqlQueryResult.getQueryResultList())
          {
-            // If this is not a hibernate error we write a log entry
-            s_log.error(t);
+            s_log.error(new NullPointerException("HqlQueryResult didn't contain a resultlist although it should according to its error state."));
          }
+         else
+         {
+            _session.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("ObjectResultController.hqlReadObjectsSuccess", _hqlQueryResult.getQueryResultList().size(), _duration));
+         }
       }
-
-      _queryListCreatorListener.listRead(this);
-
+      catch (Throwable t)
+      {
+         s_log.error(t);
+         _waitPanel.displayError(t);
+      }
+      finally
+      {
+         _queryListCreatorListener.queryExecuted(this);
+      }
    }
 
    public List getList()
    {
-      return _list;
+      return _hqlQueryResult.getQueryResultList();
    }
 
    public int getMaxNumResults()
@@ -112,50 +119,4 @@
    {
       return _waitPanel;
    }
-
-
-
-//   private List readObjects(HibernateServerConnectionImpl con, String hqlQuery, int sqlLimitRows)
-//   {
-//      long begin = System.currentTimeMillis();
-//      long duration;
-//      try
-//      {
-//         List objects;
-//
-//         objects = con.createQueryList(hqlQuery, sqlLimitRows);
-//
-//         duration = System.currentTimeMillis() - begin;
-//
-//
-//         _session.getApplication().getMessageHandler().showMessage(s_stringMgr.getString("ObjectResultController.hqlReadObjectsSuccess", objects.size(), duration));
-//
-//         return objects;
-//      }
-//      catch (Exception e)
-//      {
-//         Throwable t = Utilities.getDeepestThrowable(e);
-//         ExceptionFormatter formatter = _session.getExceptionFormatter();
-//         try
-//         {
-//            String message = formatter.format(t);
-//            _session.showErrorMessage(message);
-//         }
-//         catch (Exception e1)
-//         {
-//            _session.showErrorMessage(e1);
-//            _session.showErrorMessage(t);
-//         }
-//
-//         if (_session.getProperties().getWriteSQLErrorsToLog() ||
-//            (-1 == t.getClass().getName().toLowerCase().indexOf("hibernate") && -1 == t.getClass().getName().toLowerCase().indexOf("antlr")))
-//         {
-//            // If this is not a hibernate error we write a log entry
-//            s_log.error(t);
-//         }
-//
-//         return null;
-//      }
-//   }
-
 }

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreatorListener.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreatorListener.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/QueryListCreatorListener.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -1,8 +1,6 @@
 package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;
 
-import java.util.List;
-
 public interface QueryListCreatorListener
 {
-   public void listRead(QueryListCreator queryListCreator);
+   public void queryExecuted(QueryListCreator queryListCreator);
 }

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/ResultDataSet.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -8,14 +8,15 @@
 import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.MappedClassInfo;
 import net.sourceforge.squirrel_sql.plugins.hibernate.server.ReflectionCaller;
 import net.sourceforge.squirrel_sql.plugins.hibernate.mapping.PropertyInfo;
+import net.sourceforge.squirrel_sql.plugins.hibernate.util.HibernateUtil;
 
 import java.util.ArrayList;
 
 public class ResultDataSet implements IDataSet
 {
-   private static final int DISPLAY_WIDTH = 20;
+    private static final int DISPLAY_WIDTH = 20;
 
-   private int _curIx = -1;
+    private int _curIx = -1;
    private ColumnDisplayDefinition[] _columnDisplayDefinitions;
    private SingleType _singleType;
 
@@ -55,7 +56,7 @@
 
       if(null == obj)
       {
-         return "<object is null>";
+         return HibernateUtil.OBJECT_IS_NULL;
       }
 
       HibernatePropertyReader hpr = new HibernatePropertyReader(_columnDisplayDefinitions[columnIndex].getColumnName(), obj);
@@ -70,9 +71,9 @@
       {
          boolean wasInitialized = (Boolean) new ReflectionCaller(value).callMethod("wasInitialized").getCallee();
 
-         if(false == wasInitialized)
+         if (false == wasInitialized)
          {
-            return "<unitialized persistent collection>";
+            return HibernateUtil.UNITIALIZED_PERSISTENT_COLLECTION;
          }
       }
 

Modified: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/WaitPanel.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/WaitPanel.java	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/WaitPanel.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -1,36 +1,103 @@
 package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;
 
+import com.jidesoft.swing.MultilineLabel;
 import net.sourceforge.squirrel_sql.fw.util.StringManager;
 import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+import net.sourceforge.squirrel_sql.plugins.hibernate.HibernatePluginResources;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 public class WaitPanel extends JPanel
 {
-   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(ObjectResultController.class);
+   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(WaitPanel.class);
+   private MultilineLabel _label;
+   private boolean _isDisplayingError;
+   private JButton _btnClose;
+   private WaitPanelListener _waitPanelListener;
 
-   public WaitPanel(String hqlQuery)
+   public WaitPanel(String hqlQuery, HibernatePluginResources resource, WaitPanelListener waitPanelListener)
    {
-      setLayout(new GridBagLayout());
+      this._waitPanelListener = waitPanelListener;
+      setLayout(new BorderLayout());
 
-      GridBagConstraints gbc = new GridBagConstraints();
+      add(createCloseButtonPanel(resource), BorderLayout.NORTH);
 
-      gbc.anchor = GridBagConstraints.WEST;
-      gbc.insets = new Insets(5, 10, 5, 10);
-      gbc.gridx = 0;
-      gbc.gridy = 0;
+      add(createLabelPanel(hqlQuery), BorderLayout.CENTER);
+   }
 
-      add(new JLabel(s_stringMgr.getString("WaitPanel.hqlLabel")), gbc);
+   private JPanel createLabelPanel(String hqlQuery)
+   {
+      JPanel ret = new JPanel(new GridBagLayout());
 
-      gbc.weightx = 1;
-      ++gbc.gridx;
-      add(new JLabel(hqlQuery), gbc);
+      GridBagConstraints gbc;
+      gbc = new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 10, 5, 10), 0, 0);
 
+      ret.add(new JLabel(s_stringMgr.getString("WaitPanel.hqlLabel")), gbc);
+
+      gbc = new GridBagConstraints(1, 0, 1, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 10, 5, 10), 0, 0);
+      _label = new MultilineLabel(hqlQuery);
+      ret.add(_label, gbc);
+
+      return ret;
    }
 
+   private JPanel createCloseButtonPanel(HibernatePluginResources resource)
+   {
+      JPanel ret = new JPanel(new BorderLayout());
+
+      ret.add(new JPanel(), BorderLayout.CENTER);
+
+      _btnClose = new JButton(resource.getIcon(HibernatePluginResources.IKeys.CLOSE_IMAGE));
+
+      _btnClose.setMargin(new Insets(0, 0, 0, 0));
+      _btnClose.setBorderPainted(false);
+
+      _btnClose.setVisible(false);
+      ret.add(_btnClose, BorderLayout.EAST);
+
+      _btnClose.addActionListener(new ActionListener()
+      {
+         @Override
+         public void actionPerformed(ActionEvent e)
+         {
+            _waitPanelListener.removeWaitPanel(WaitPanel.this);
+         }
+      });
+
+      return ret;
+   }
+
    public String getTitle()
    {
       return s_stringMgr.getString("WaitPanel.title");
    }
+
+   public boolean isDisplayingError()
+   {
+      return _isDisplayingError;
+   }
+
+   public void displayError(Throwable t)
+   {
+      prepareForErrorDisplay();
+      _label.setText(s_stringMgr.getString("WaitPanel.errorOccured", t.getMessage()));
+   }
+
+   public void displayHqlQueryError(String errMsg)
+   {
+      prepareForErrorDisplay();
+      _label.setText(s_stringMgr.getString("WaitPanel.hqlErrorOccured", errMsg));
+   }
+
+   private void prepareForErrorDisplay()
+   {
+      _label.setBackground(Color.white);
+      _label.setForeground(Color.red);
+      _label.setFont(_label.getFont().deriveFont(Font.BOLD));
+      _btnClose.setVisible(true);
+      _isDisplayingError = true;
+   }
 }

Added: trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/WaitPanelListener.java
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/WaitPanelListener.java	                        (rev 0)
+++ trunk/sql12/plugins/hibernate/src/main/java/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/WaitPanelListener.java	2011-10-09 14:55:13 UTC (rev 6460)
@@ -0,0 +1,6 @@
+package net.sourceforge.squirrel_sql.plugins.hibernate.viewobjects;
+
+public interface WaitPanelListener
+{
+   void removeWaitPanel(WaitPanel waitPanel);
+}

Modified: trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/I18NStrings.properties	2011-10-08 14:24:10 UTC (rev 6459)
+++ trunk/sql12/plugins/hibernate/src/main/resources/net/sourceforge/squirrel_sql/plugins/hibernate/viewobjects/I18NStrings.properties	2011-10-09 14:55:13 UTC (rev 6460)
@@ -25,4 +25,8 @@
   Childern of this node display data of a mapped class in a table.\
   The rows of a table match the tree nodes in the tree representation with respect to the tree hierarchy.\n\n\
   Note: To redisplay this message hold ctrl and click the selected node of the meta data tree.\n\n\
-  HQL query:\n{0}
\ No newline at end of file
+  HQL query:\n{0}
+
+
+WaitPanel.errorOccured=Unexpected error occured while executing hql statement:\n{0}\n\nSee logs for details.
+WaitPanel.hqlErrorOccured=Error in hql query:\n{0}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6459] trunk/sql12/fw/src/main

[<wi...@us...>]

Revision: 6459
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6459&view=rev
Author:   wis775
Date:     2011-10-08 14:24:10 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Store result of SQL in file: Let the user take the choice, if he want to export the entire result set or only n lines.

Modified Paths:
--------------
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java
    trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/I18NStrings.properties

Added Paths:
-----------
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java	2011-10-08 13:37:33 UTC (rev 6458)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCommand.java	2011-10-08 14:24:10 UTC (rev 6459)
@@ -49,6 +49,8 @@
 		// i18n[ResultSetExportCommand.errorExecuteStatement="Could not create the data for exporting."]
 		String ERROR_EXECUTE_STATEMENT = s_stringMgr
 				.getString("ResultSetExportCommand.errorExecuteStatement");
+		
+		String EXECUTING_QUERY = s_stringMgr.getString("ResultSetExportCommand.executingQuery");
 
 	}
 
@@ -86,7 +88,11 @@
 	@Override
 	protected IExportData createExportData(TableExportCsvController ctrl) throws ExportDataException{
 		try {
-			super.progress("Running the query");
+			super.progress(i18n.EXECUTING_QUERY);
+			ResultSetExportCsvController controller = (ResultSetExportCsvController)ctrl;
+			if(controller.exportComplete() == false){
+				stmt.setMaxRows(controller.getMaxRows());
+			}
 			this.resultSet = stmt.executeQuery(sql);
 			return new ResultSetExportData(this.resultSet, dialect);
 		} catch (SQLException e) {

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java	2011-10-08 13:37:33 UTC (rev 6458)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportCsvController.java	2011-10-08 14:24:10 UTC (rev 6459)
@@ -18,14 +18,26 @@
  */
 package net.sourceforge.squirrel_sql.fw.gui.action;
 
+import java.util.prefs.Preferences;
 
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
+
 /**
- * A specialization of {@link TableExportCsvController}, that tells the user, that exporting to Excel is dangerous, if the SQL returns a huge data set.
+ * A specialization of {@link TableExportCsvController}, that honors that the source is a SQL-Statement.
+ * The following behavior is changed:
+ * <ul>
+ * 	<li>Tell the user, that exporting to Excel is dangerous, if the SQL returns a huge data set.</li>
+ *  <li>Let the user choose, if he want to export the whole result-set or only the first n lines</li>
+ * </ul>
+ * 
  * @author Stefan Willinger
  *
  */
 public class ResultSetExportCsvController extends TableExportCsvController {
 
+	private static final String PREF_KEY_LIMIT_ROWS = "SquirrelSQL.sqlexport.limitRows";
 	/**
 	 * @see net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvController#shouldWarnIfExcel()
 	 */
@@ -33,5 +45,58 @@
 	protected boolean shouldWarnIfExcel() {
 		return true;
 	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvController#createDialog()
+	 */
+	@Override
+	protected ResultSetExportDialog createDialog() {
+		final ResultSetExportDialog dlg = new ResultSetExportDialog();
+		 
+		dlg.radComplete.addChangeListener(new ChangeListener() {
+			@Override
+			public void stateChanged(ChangeEvent e) {
+				if(dlg.radComplete.isSelected()){
+					dlg.txtLimitRows.setEnabled(false);
+				}else{
+					dlg.txtLimitRows.setEnabled(true);
+				}
+			}
+		});
+		return dlg;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvController#writePrefs()
+	 */
+	@Override
+	protected void writePrefs() {
+		super.writePrefs();
+		ResultSetExportDialog dlg = (ResultSetExportDialog) super.getDialog();
+		
+		 Preferences.userRoot().put(PREF_KEY_LIMIT_ROWS, dlg.txtLimitRows.getText());
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvController#initSelectionPanel(java.util.prefs.Preferences)
+	 */
+	@Override
+	protected void initSelectionPanel(Preferences userRoot) {
+		super.initSelectionPanel(userRoot);
+		 
+		ResultSetExportDialog dlg = (ResultSetExportDialog) super.getDialog();
+		dlg.txtLimitRows.setText(userRoot.get(PREF_KEY_LIMIT_ROWS, "100"));
+		
+		if(dlg.radComplete.isSelected()){
+			dlg.txtLimitRows.setEnabled(false);
+		}
+	}
 	
+	public int getMaxRows(){
+		ResultSetExportDialog dlg = (ResultSetExportDialog) super.getDialog();
+		return dlg.txtLimitRows.getInt();
+	}
+	
+	
+	
 }

Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java	                        (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java	2011-10-08 14:24:10 UTC (rev 6459)
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@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.gui.action;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+
+import net.sourceforge.squirrel_sql.fw.gui.IntegerField;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+/**
+ * A customized {@link TableExportCsvDlg}.
+ * This customized dialog offer the option to export the whole or only the frist n rows of the result-set.
+ * @author Stefan Willinger
+ *
+ */
+public class ResultSetExportDialog extends TableExportCsvDlg {
+	
+	static final StringManager s_stringMgr = StringManagerFactory
+			.getStringManager(ResultSetExportCommand.class);
+
+	static interface i18n {
+		String EXPORT_COMPLETE = s_stringMgr.getString("ResultSetExportDialog.executingQuery");
+		String LIMIT_ROWS = s_stringMgr.getString("ResultSetExportDialog.limitRows");
+	}
+
+	IntegerField txtLimitRows;
+	
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.gui.action.TableExportCsvDlg#getSelelectionPanel()
+	 */
+	@Override
+	protected Component getSelelectionPanel() {
+		JPanel ret = new JPanel(new GridBagLayout());
+
+	      GridBagConstraints gbc;
+
+	      radComplete = new JRadioButton(i18n.EXPORT_COMPLETE);
+	      gbc = new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0);
+	      ret.add(radComplete, gbc);
+
+	      radSelection = new JRadioButton(i18n.LIMIT_ROWS);
+	      gbc = new GridBagConstraints(1, 0, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0);
+	      ret.add(radSelection, gbc);
+
+	      gbc = new GridBagConstraints(2, 0, 1, 1, 0, 0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0);
+	      txtLimitRows = new IntegerField(5);
+	      ret.add(txtLimitRows, gbc);
+	      
+	      gbc = new GridBagConstraints(3, 0, 1, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0);
+	      ret.add(new JPanel(), gbc);
+
+
+	      ButtonGroup bg = new ButtonGroup();
+	      bg.add(radComplete);
+	      bg.add(radSelection);
+
+	      return ret;
+	}
+
+}


Property changes on: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/ResultSetExportDialog.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java	2011-10-08 13:37:33 UTC (rev 6458)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvController.java	2011-10-08 14:24:10 UTC (rev 6459)
@@ -51,7 +51,7 @@
 
    TableExportCsvController()
    {
-      _dlg = new TableExportCsvDlg();
+      _dlg = createDialog();
 
       initDlg();
 
@@ -76,6 +76,10 @@
 
    }
 
+   protected TableExportCsvDlg createDialog() {
+	   return new TableExportCsvDlg();
+   }
+
    private void onSeparatorCharChanged(KeyEvent e)
    {
       SwingUtilities.invokeLater(new Runnable()
@@ -424,7 +428,7 @@
 	   return false;
    }
 
-private void writePrefs()
+protected void writePrefs()
    {
       Preferences.userRoot().put(PREF_KEY_CSV_FILE, _dlg.txtFile.getText());
       Preferences.userRoot().put(PREF_KEY_CSV_ENCODING, _dlg.charsets.getSelectedItem().toString());
@@ -441,7 +445,7 @@
       Preferences.userRoot().put(PREF_KEY_COMMAND, _dlg.txtCommand.getText());
    }
 
-
+	
    private void initDlg()
    {
       Preferences userRoot = Preferences.userRoot();
@@ -479,14 +483,7 @@
 
 
 
-      if(userRoot.getBoolean(PREF_KEY_EXPORT_COMPLETE, true))
-      {
-         _dlg.radComplete.setSelected(true);
-      }
-      else
-      {
-         _dlg.radSelection.setSelected(true);
-      }
+      initSelectionPanel(userRoot);
 
       if(userRoot.getBoolean(PREF_KEY_USE_GLOBAL_PREFS_FORMATING, true))
       {
@@ -509,6 +506,21 @@
       _dlg._lineSeparators.setSelectedItem(preferredLineSeparator);
    }
 
+   /**
+    * Initialize the values for the selection panel from the saved properties.
+    * @param userRoot the saved properties.
+    */
+   protected void initSelectionPanel(Preferences userRoot) {
+	   if(userRoot.getBoolean(PREF_KEY_EXPORT_COMPLETE, true))
+	   {
+		   _dlg.radComplete.setSelected(true);
+	   }
+	   else
+	   {
+		   _dlg.radSelection.setSelected(true);
+	   }
+   }
+
    private void onChkExecCommand()
    {
       _dlg.txtCommand.setEnabled(_dlg.chkExecCommand.isSelected());
@@ -642,4 +654,8 @@
       }
 
    }
+   
+   protected TableExportCsvDlg getDialog() {
+	   return this._dlg;
+   }
 }

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java	2011-10-08 13:37:33 UTC (rev 6458)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvDlg.java	2011-10-08 14:24:10 UTC (rev 6459)
@@ -227,7 +227,10 @@
    }
 
 
-   private Component getSelelectionPanel()
+   /**
+    * Create a panel for the selection options.
+    */
+   protected Component getSelelectionPanel()
    {
       JPanel ret = new JPanel(new GridBagLayout());
 

Modified: trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/I18NStrings.properties
===================================================================
--- trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/I18NStrings.properties	2011-10-08 13:37:33 UTC (rev 6458)
+++ trunk/sql12/fw/src/main/resources/net/sourceforge/squirrel_sql/fw/gui/action/I18NStrings.properties	2011-10-08 14:24:10 UTC (rev 6459)
@@ -55,3 +55,7 @@
 TableExportCsvDlg.useGlobalPrefsFormatingExcel=Use formatting as configured in Global Prefs (recommended for MS Excel)
 
 ResultSetExportCommand.errorExecuteStatement=An error was encountered while attempting to build the data set for export.
+ResultSetExportCommand.executingQuery=Executing the query
+
+ResultSetExportDialog.executingQuery=Export the complete result set
+ResultSetExportDialog.limitRows=Limit rows to
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6458] trunk/sql12/ squirrelsql-integration-environment/pom.xml

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

Revision: 6458
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6458&view=rev
Author:   manningr
Date:     2011-10-08 13:37:33 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Added dependencies for Postgres and Sybase plugins.

Modified Paths:
--------------
    trunk/sql12/squirrelsql-integration-environment/pom.xml

Modified: trunk/sql12/squirrelsql-integration-environment/pom.xml
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/pom.xml	2011-10-08 13:36:50 UTC (rev 6457)
+++ trunk/sql12/squirrelsql-integration-environment/pom.xml	2011-10-08 13:37:33 UTC (rev 6458)
@@ -184,6 +184,20 @@
 			<version>${squirrel-sql-version}</version>
 			<scope>test</scope>
 		</dependency>		
+
+		<dependency>
+			<groupId>net.sf.squirrel-sql.plugins</groupId>
+			<artifactId>postgres</artifactId>
+			<version>${squirrel-sql-version}</version>
+			<scope>test</scope>
+		</dependency>		
+
+		<dependency>
+			<groupId>net.sf.squirrel-sql.plugins</groupId>
+			<artifactId>sybase</artifactId>
+			<version>${squirrel-sql-version}</version>
+			<scope>test</scope>
+		</dependency>		
 								
 		<dependency>
 			<groupId>net.sf.dbmonster</groupId>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6457] trunk/sql12/ squirrelsql-integration-environment/src/test/resources/log4j.properties

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

Revision: 6457
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6457&view=rev
Author:   manningr
Date:     2011-10-08 13:36:50 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
logger for DBCopy plugin.

Modified Paths:
--------------
    trunk/sql12/squirrelsql-integration-environment/src/test/resources/log4j.properties

Modified: trunk/sql12/squirrelsql-integration-environment/src/test/resources/log4j.properties
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/resources/log4j.properties	2011-10-08 13:36:09 UTC (rev 6456)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/resources/log4j.properties	2011-10-08 13:36:50 UTC (rev 6457)
@@ -8,6 +8,8 @@
 log4j.logger.pl.kernelpanic.dbmonster.test=INFO, CONSOLE
 log4j.logger.pl.kernelpanic.dbmonster.schema.Table=DEBUG, CONSOLE
 
+log4j.logger.net.sourceforge.squirrel_sql.plugins.dbcopy=DEBUG, CONSOLE
+
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.ConversionPattern=%d %-5p %C{1} - %m%n
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6456] trunk/sql12/ squirrelsql-integration-environment/src/test/java/net/sourceforge/ squirrel_sql/plugins

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

Revision: 6456
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6456&view=rev
Author:   manningr
Date:     2011-10-08 13:36:09 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
New SQL tests for Sybase tabs.

Added Paths:
-----------
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/TriggerSourceTabExternalTest.java
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/ViewSourceTabExternalTest.java

Added: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/TriggerSourceTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/TriggerSourceTabExternalTest.java	                        (rev 0)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/TriggerSourceTabExternalTest.java	2011-10-08 13:36:09 UTC (rev 6456)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2011 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package net.sourceforge.squirrel_sql.plugins.SybaseASE.tab;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractFormattedSourceTabExternalTest;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+
+public class TriggerSourceTabExternalTest extends AbstractFormattedSourceTabExternalTest
+{
+	
+	protected String getSimpleName() {
+		return "testTrigger";
+	}
+	
+	protected BaseSourceTab getTabToTest() {
+		return new TriggerSourceTab("a hint", "");
+	}
+	
+	protected String getAlias() {
+		return AliasNames.SYBASE_DEST_ALIAS_NAME;
+	}
+
+}

Added: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/ViewSourceTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/ViewSourceTabExternalTest.java	                        (rev 0)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/SybaseASE/tab/ViewSourceTabExternalTest.java	2011-10-08 13:36:09 UTC (rev 6456)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2011 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package net.sourceforge.squirrel_sql.plugins.SybaseASE.tab;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractFormattedSourceTabExternalTest;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+
+public class ViewSourceTabExternalTest extends AbstractFormattedSourceTabExternalTest
+{
+	
+	protected String getSimpleName() {
+		return "testView";
+	}
+	
+	protected BaseSourceTab getTabToTest() {
+		return new ViewSourceTab("a hint", "");
+	}
+	
+	protected String getAlias() {
+		return AliasNames.SYBASE_DEST_ALIAS_NAME;
+	}
+
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6455] trunk/sql12/ squirrelsql-integration-environment/src/test/java/net/sourceforge/ squirrel_sql

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

Revision: 6455
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6455&view=rev
Author:   manningr
Date:     2011-10-08 13:35:06 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
New tests for Sybase.

Modified Paths:
--------------
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AliasNames.java
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DbCopyCliExternalIntegrationTest.java

Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AliasNames.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AliasNames.java	2011-10-08 13:34:12 UTC (rev 6454)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AliasNames.java	2011-10-08 13:35:06 UTC (rev 6455)
@@ -64,4 +64,8 @@
 	
 	String POSTGRES_DEST_ALIAS_NAME = "PostgreSQL";
 
+	String SYBASE_SOURCE_ALIAS_NAME = "Sybase (dbcopysrc)";
+	
+	String SYBASE_DEST_ALIAS_NAME = "Sybase (dbcopydest)";
+	
 }

Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DbCopyCliExternalIntegrationTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DbCopyCliExternalIntegrationTest.java	2011-10-08 13:34:12 UTC (rev 6454)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/dbcopy/cli/DbCopyCliExternalIntegrationTest.java	2011-10-08 13:35:06 UTC (rev 6455)
@@ -163,6 +163,24 @@
 	}
 		
 	@Test
+	public void testDerbyToSybase() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.DERBY_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.SYBASE_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, null, null, destSession, "dbcopydest", "dbo", TABLE_LIST_UPPER);
+	}	
+	
+	@Test
+	public void testMysql4ToDerby() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.DERBY_DEST_ALIAS_NAME);
+
+		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "APP", TABLE_LIST_UPPER);		
+	}	
+	
+	@Test
 	public void testMysql4ToDb2() throws Exception
 	{
 		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
@@ -171,7 +189,98 @@
 		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "DBCPDST", TABLE_LIST_LOWER);		
 	}
 
+	@Test
+	public void testMysql4ToFirebird() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.FIREBIRD_DEST_ALIAS_NAME);
+
+		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "APP", TABLE_LIST_UPPER);		
+	}
 	
+	@Test
+	public void testMysql4ToFrontbase() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.FRONTBASE_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "DBCOPY", TABLE_LIST_UPPER);
+	}	
+	
+	@Test
+	public void testMysql4ToH2() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.H2_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "PUBLIC", TABLE_LIST_UPPER);
+	}
+	
+	@Test
+	public void testMysql4ToInformix() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.INFORMIX_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "dbcopysrc", null, destSession, "ansidb", "informix", TABLE_LIST_UPPER);
+	}
+	
+	@Test
+	public void testMysql4ToMysql4() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "dbcopydest", TABLE_LIST_UPPER);
+	}	
+	
+	@Test
+	public void testMysql4ToMysql5() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL5_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "dbcopydest", TABLE_LIST_UPPER);
+	}	
+
+	@Test
+	public void testMysql4ToOracle() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.ORACLE_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "DBCOPYDEST", TABLE_LIST_UPPER);
+	}
+	
+	@Test
+	public void testMysql4ToPointbase() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.POINTBASE_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "DBCOPY", TABLE_LIST_UPPER);
+	}	
+	
+	@Test
+	public void testMysql4ToPostgreSQL() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.POSTGRES_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "dbcopysrc", null, destSession, null, "public", TABLE_LIST_UPPER);
+	}	
+	
+	@Test
+	public void testMysql4ToSybase() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.MYSQL4_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.SYBASE_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "dbcopysrc", null, destSession, "dbcopydest", "dbo", TABLE_LIST_UPPER);
+	}	
+	
+
+	
 	// This test is currently broken because DB2 doesn't allow null clob column values for 
 	// table with just one column.
 	@Test
@@ -183,8 +292,26 @@
 		testCopy(sourceSession, "PUBLIC", "PUBLIC", destSession, null, "DBCPDST", TABLE_LIST_UPPER);		
 	}
 	
+	@Test
+	public void testHsqldbToPostgreSQL() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.HSQLDB_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.POSTGRES_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "PUBLIC", "PUBLIC", destSession, null, "public", TABLE_LIST_UPPER);
+	}	
 	
 	@Test
+	public void testHsqldbToSybase() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.HSQLDB_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.SYBASE_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, "PUBLIC", "PUBLIC", destSession, "dbcopydest", "dbo", TABLE_LIST_UPPER);
+	}	
+	
+	
+	@Test
 	public void testH2ToDb2() throws Exception
 	{
 		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.H2_SOURCE_ALIAS_NAME);
@@ -284,6 +411,15 @@
 	}
 		
 	@Test
+	public void testH2ToSybase() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.H2_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.SYBASE_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, null, "PUBLIC", destSession, "dbcopydest", "dbo", TABLE_LIST_UPPER);
+	}	
+
+	@Test
 	public void testOracleToDb2() throws Exception
 	{
 		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.ORACLE_SOURCE_ALIAS_NAME);
@@ -392,6 +528,15 @@
 	}
 
 	@Test
+	public void testOracleToSybase() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.ORACLE_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.SYBASE_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, null, "DBCOPYSRC", destSession, "dbcopydest", "dbo", TABLE_LIST_UPPER);
+	}	
+	
+	@Test
 	public void testPointbaseToDerby() throws Exception
 	{
 		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.POINTBASE_DEST_ALIAS_NAME);
@@ -499,6 +644,14 @@
 		testCopy(sourceSession, null, "DBCOPY", destSession, null, "public", TABLE_LIST_UPPER);
 	}
 	
+	@Test
+	public void testPointbaseToSybase() throws Exception
+	{
+		ISession sourceSession = sessionUtil.getSessionForAlias(AliasNames.POINTBASE_SOURCE_ALIAS_NAME);
+		ISession destSession = sessionUtil.getSessionForAlias(AliasNames.SYBASE_DEST_ALIAS_NAME);
+		
+		testCopy(sourceSession, null, "DBCOPY", destSession, "dbcopydest", "dbo", TABLE_LIST_UPPER);
+	}
 	
 	
 	private String concat(List<String> lines) {
@@ -583,7 +736,9 @@
 		try {
 			runner.run();
 		} catch (Exception e) {
-			System.err.println((new DB2JCCExceptionFormatter()).format(e));
+			if (DialectFactory.isDB2(sourceSession.getMetaData()) || DialectFactory.isDB2(destSession.getMetaData())) {
+				System.err.println((new DB2JCCExceptionFormatter()).format(e));
+			} 
 			throw e;
 		}
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6454] trunk/sql12/ squirrelsql-integration-environment/src/test/java/net/sourceforge/ squirrel_sql/plugins

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

Revision: 6454
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6454&view=rev
Author:   manningr
Date:     2011-10-08 13:34:12 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
External SQL Tests for postgres tabs.

Added Paths:
-----------
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/IndexDetailsTabExternalTest.java
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/IndexSourceTabExternalTest.java
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/ProcedureSourceTabExternalTest.java
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/SequenceDetailsTabExternalTest.java

Added: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/IndexDetailsTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/IndexDetailsTabExternalTest.java	                        (rev 0)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/IndexDetailsTabExternalTest.java	2011-10-08 13:34:12 UTC (rev 6454)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2011 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package net.sourceforge.squirrel_sql.plugins.postgres.tab;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractBasePreparedStatementTabExternalTest;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
+
+public class IndexDetailsTabExternalTest extends AbstractBasePreparedStatementTabExternalTest
+{
+	
+	protected String getSimpleName() {
+		return "testIndex";
+	}
+	
+	protected BasePreparedStatementTab getTabToTest() {
+		return new IndexDetailsTab();
+	}
+	
+	protected String getAlias() {
+		return AliasNames.POSTGRES_DEST_ALIAS_NAME;
+	}
+
+}

Added: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/IndexSourceTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/IndexSourceTabExternalTest.java	                        (rev 0)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/IndexSourceTabExternalTest.java	2011-10-08 13:34:12 UTC (rev 6454)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2011 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package net.sourceforge.squirrel_sql.plugins.postgres.tab;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractFormattedSourceTabExternalTest;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+
+public class IndexSourceTabExternalTest extends AbstractFormattedSourceTabExternalTest
+{
+	
+	protected String getSimpleName() {
+		return "testIndex";
+	}
+	
+	protected BaseSourceTab getTabToTest() {
+		return new IndexSourceTab("a hint", "");
+	}
+	
+	protected String getAlias() {
+		return AliasNames.POSTGRES_DEST_ALIAS_NAME;
+	}
+
+}

Added: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/ProcedureSourceTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/ProcedureSourceTabExternalTest.java	                        (rev 0)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/ProcedureSourceTabExternalTest.java	2011-10-08 13:34:12 UTC (rev 6454)
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2011 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package net.sourceforge.squirrel_sql.plugins.postgres.tab;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractFormattedSourceTabExternalTest;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BaseSourceTab;
+
+public class ProcedureSourceTabExternalTest extends AbstractFormattedSourceTabExternalTest
+{
+	
+	protected String getSimpleName() {
+		return "testProcedure";
+	}
+	
+	protected BaseSourceTab getTabToTest() {
+		return new ProcedureSourceTab("a hint");
+	}
+	
+	protected String getAlias() {
+		return AliasNames.POSTGRES_DEST_ALIAS_NAME;
+	}
+
+}

Added: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/SequenceDetailsTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/SequenceDetailsTabExternalTest.java	                        (rev 0)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/postgres/tab/SequenceDetailsTabExternalTest.java	2011-10-08 13:34:12 UTC (rev 6454)
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2011 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package net.sourceforge.squirrel_sql.plugins.postgres.tab;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractBasePreparedStatementTabExternalTest;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AliasNames;
+import net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.BasePreparedStatementTab;
+
+public class SequenceDetailsTabExternalTest extends AbstractBasePreparedStatementTabExternalTest
+{
+	
+	
+	private static final String TEST_SEQUENCE = "testSequence";
+
+	protected String getSimpleName() {
+		return TEST_SEQUENCE;
+	}
+	
+	protected BasePreparedStatementTab getTabToTest() {
+		return new SequenceDetailsTab();
+	}
+	
+	protected String getAlias() {
+		return AliasNames.POSTGRES_DEST_ALIAS_NAME;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractBasePreparedStatementTabExternalTest#getSchemaName()
+	 */
+	@Override
+	protected String getSchemaName()
+	{
+		return "public";
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractBasePreparedStatementTabExternalTest#getSetupStatements()
+	 */
+	@Override
+	protected List<String> getSetupStatements()
+	{
+		ArrayList<String> result = new ArrayList<String>();
+		result.add("create sequence "+TEST_SEQUENCE);
+		return result;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree.tabs.AbstractBasePreparedStatementTabExternalTest#getTeardownStatements()
+	 */
+	@Override
+	protected List<String> getTeardownStatements()
+	{
+		ArrayList<String> result = new ArrayList<String>();
+		result.add("drop sequence "+TEST_SEQUENCE);
+		return result;		
+	}
+
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6453] trunk/sql12/fw/src/main/java/net/ sourceforge/squirrel_sql/fw/dialects

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

Revision: 6453
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6453&view=rev
Author:   manningr
Date:     2011-10-08 13:28:26 +0000 (Sat, 08 Oct 2011)
Log Message:
-----------
Dialect support for the TeiidDialect.

Added Paths:
-----------
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/TeiidDialect.java
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/TeiidDialectExt.java

Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/TeiidDialect.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/TeiidDialect.java	                        (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/TeiidDialect.java	2011-10-08 13:28:26 UTC (rev 6453)
@@ -0,0 +1,270 @@
+package net.sourceforge.squirrel_sql.fw.dialects;
+
+/*
+ * JBoss, Home of Professional Open Source.
+ * See the COPYRIGHT.txt file distributed with this work for information
+ * regarding copyright ownership.  Some portions may be licensed
+ * to Red Hat, Inc. under one or more contributor license agreements.
+ * 
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ */
+
+import java.sql.CallableStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
+import org.hibernate.Hibernate;
+import org.hibernate.LockMode;
+import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.function.NoArgSQLFunction;
+import org.hibernate.dialect.function.StandardSQLFunction;
+import org.hibernate.dialect.function.VarArgsSQLFunction;
+
+/**
+ * This class was temporarily re-packaged and will remain so until it deployed to
+ * Maven Central with the original package (org.teiid.dialect). Since it is part
+ * of JBoss, and JBoss is moving to Central, it is believed that this will only
+ * be a temporary necessity.
+ */
+public class TeiidDialect extends Dialect {
+
+    public TeiidDialect() {
+        // Register types
+        registerColumnType(Types.CHAR, "char"); //$NON-NLS-1$
+        registerColumnType(Types.VARCHAR, "string"); //$NON-NLS-1$
+
+        registerColumnType(Types.BIT, "boolean"); //$NON-NLS-1$
+        registerColumnType(Types.TINYINT, "byte"); //$NON-NLS-1$
+        registerColumnType(Types.SMALLINT, "short"); //$NON-NLS-1$
+        registerColumnType(Types.INTEGER, "integer"); //$NON-NLS-1$
+        registerColumnType(Types.BIGINT, "long"); //$NON-NLS-1$
+
+        registerColumnType(Types.REAL, "float"); //$NON-NLS-1$
+        registerColumnType(Types.FLOAT, "float"); //$NON-NLS-1$
+        registerColumnType(Types.DOUBLE, "double"); //$NON-NLS-1$
+        registerColumnType(Types.NUMERIC, "bigdecimal"); //$NON-NLS-1$
+
+        registerColumnType(Types.DATE, "date"); //$NON-NLS-1$
+        registerColumnType(Types.TIME, "time"); //$NON-NLS-1$
+        registerColumnType(Types.TIMESTAMP, "timestamp"); //$NON-NLS-1$
+
+        registerColumnType(Types.BLOB, "blob"); //$NON-NLS-1$
+        registerColumnType(Types.VARBINARY, "blob"); //$NON-NLS-1$
+        registerColumnType(Types.CLOB, "clob"); //$NON-NLS-1$
+        registerColumnType(Types.JAVA_OBJECT, "object"); //$NON-NLS-1$
+        
+        registerFunction("acos", new StandardSQLFunction("acos", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("asin", new StandardSQLFunction("asin", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("atan", new StandardSQLFunction("atan", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("atan2", new StandardSQLFunction("atan2", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("ceil", new StandardSQLFunction("ceiling")); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("cos", new StandardSQLFunction("cos", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("cot", new StandardSQLFunction("cot", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("degrees", new StandardSQLFunction("degrees", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("exp", new StandardSQLFunction("exp", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("floor", new StandardSQLFunction("floor")); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("formatbigdecimal", new StandardSQLFunction("formatbigdecimal", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("formatbiginteger", new StandardSQLFunction("formatbiginteger", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("formatdouble", new StandardSQLFunction("formatdouble", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("formatfloat", new StandardSQLFunction("formatfloat", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("formatinteger", new StandardSQLFunction("formatinteger", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("formatlong", new StandardSQLFunction("formatlong", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("log", new StandardSQLFunction("log", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("mod", new StandardSQLFunction("mod")); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("parsebigdecimal", new StandardSQLFunction("parsebigdecimal", Hibernate.BIG_DECIMAL)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("parsebiginteger", new StandardSQLFunction("parsebiginteger", Hibernate.BIG_INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("parsedouble", new StandardSQLFunction("parsedouble", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("parsefloat", new StandardSQLFunction("parsefloat", Hibernate.FLOAT)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("parseinteger", new StandardSQLFunction("parseinteger", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("parselong", new StandardSQLFunction("parselong", Hibernate.LONG)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("pi", new StandardSQLFunction("pi", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("power", new StandardSQLFunction("power", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("radians", new StandardSQLFunction("radians", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("round", new StandardSQLFunction("round")); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("sign", new StandardSQLFunction("sign", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("sin", new StandardSQLFunction("sin", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("tan", new StandardSQLFunction("tan", Hibernate.DOUBLE)); //$NON-NLS-1$ //$NON-NLS-2$
+
+        registerFunction("ascii", new StandardSQLFunction("ascii", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("chr", new StandardSQLFunction("chr", Hibernate.CHARACTER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("char", new StandardSQLFunction("char", Hibernate.CHARACTER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("concat", new VarArgsSQLFunction(Hibernate.STRING, "", "||", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+        registerFunction("initcap", new StandardSQLFunction("initcap", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("insert", new StandardSQLFunction("insert", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("lcase", new StandardSQLFunction("lcase", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("left", new StandardSQLFunction("left", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("locate", new StandardSQLFunction("locate", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("lpad", new StandardSQLFunction("lpad", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("ltrim", new StandardSQLFunction("ltrim", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("repeat", new StandardSQLFunction("repeat", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("replace", new StandardSQLFunction("replace", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("right", new StandardSQLFunction("right", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("rpad", new StandardSQLFunction("rpad", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("rtrim", new StandardSQLFunction("rtrim", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("substring", new StandardSQLFunction("substring", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("translate", new StandardSQLFunction("translate", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("ucase", new StandardSQLFunction("ucase", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+
+        registerFunction("curdate", new NoArgSQLFunction("curdate", Hibernate.DATE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("curtime", new NoArgSQLFunction("curtime", Hibernate.TIME)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("now", new NoArgSQLFunction("now", Hibernate.TIMESTAMP)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("dayname", new StandardSQLFunction("dayname", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("dayofmonth", new StandardSQLFunction("dayofmonth", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("dayofweek", new StandardSQLFunction("dayofweek", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("dayofyear", new StandardSQLFunction("dayofyear", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("formatdate", new StandardSQLFunction("formatdate", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("formattime", new StandardSQLFunction("formattime", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("formattimestamp", new StandardSQLFunction("formattimestamp", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("hour", new StandardSQLFunction("hour", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("minute", new StandardSQLFunction("minute", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("monthname", new StandardSQLFunction("monthname", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("parsedate", new StandardSQLFunction("parsedate", Hibernate.DATE)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("parsetime", new StandardSQLFunction("parsetime", Hibernate.TIME)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("parsetimestamp", new StandardSQLFunction("parsetimestamp", Hibernate.TIMESTAMP)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("second", new StandardSQLFunction("second", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("timestampcreate", new StandardSQLFunction("timestampcreate", Hibernate.TIMESTAMP)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("timestampAdd", new StandardSQLFunction("timestampAdd")); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("timestampDiff", new StandardSQLFunction("timestampDiff", Hibernate.LONG)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("week", new StandardSQLFunction("week", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("year", new StandardSQLFunction("year", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("modifytimezone", new StandardSQLFunction("modifytimezone", Hibernate.TIMESTAMP)); //$NON-NLS-1$ //$NON-NLS-2$
+
+        registerFunction("convert", new StandardSQLFunction("convert")); //$NON-NLS-1$ //$NON-NLS-2$
+        
+        registerFunction("to_bytes", new StandardSQLFunction("to_bytes", Hibernate.BLOB)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("to_chars", new StandardSQLFunction("to_chars", Hibernate.CLOB)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("from_unittime", new StandardSQLFunction("from_unittime", Hibernate.TIMESTAMP)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("session_id", new StandardSQLFunction("session_id", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        
+        registerFunction("uuid", new StandardSQLFunction("uuid", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("unescape", new StandardSQLFunction("unescape", Hibernate.STRING)); //$NON-NLS-1$ //$NON-NLS-2$
+        
+        registerFunction("array_get", new StandardSQLFunction("uuid", Hibernate.OBJECT)); //$NON-NLS-1$ //$NON-NLS-2$
+        registerFunction("array_length", new StandardSQLFunction("unescape", Hibernate.INTEGER)); //$NON-NLS-1$ //$NON-NLS-2$
+    }
+
+    public boolean dropConstraints() {
+        return false;
+    }
+
+    public boolean hasAlterTable() {
+        return false;
+    }
+
+    public boolean supportsColumnCheck() {
+        return false;
+    }
+
+    public boolean supportsCascadeDelete() {
+        return false;
+    }
+
+    public String getCurrentTimestampSQLFunctionName() {
+        return "now"; //$NON-NLS-1$
+    }
+
+    public boolean isCurrentTimestampSelectStringCallable() {
+        return false;
+    }
+
+    public boolean supportsCurrentTimestampSelection() {
+        return true;
+    }
+
+    public boolean supportsLimit() {
+        return true;
+    }
+
+    public boolean supportsOuterJoinForUpdate() {
+        return false;
+    }
+
+    public boolean supportsTableCheck() {
+        return false;
+    }
+
+    public boolean supportsUnionAll() {
+        return true;
+    }
+
+    public boolean supportsUnique() {
+        return false;
+    }
+
+    public String toBooleanValueString(boolean arg0) {
+        if (arg0) {
+            return "{b'true'}"; //$NON-NLS-1$
+        }
+        return "{b'false'}"; //$NON-NLS-1$
+    }
+
+    /**
+     * @see org.hibernate.dialect.Dialect#getLimitString(java.lang.String, boolean)
+     */
+    public String getLimitString(String querySelect,
+                                 boolean hasOffset) {
+        return new StringBuffer(querySelect.length() + 20).append(querySelect).append(hasOffset ? " limit ?, ?" : " limit ?") //$NON-NLS-1$ //$NON-NLS-2$
+                                                          .toString();
+    }
+
+    /**
+     * @see org.hibernate.dialect.Dialect#getResultSet(java.sql.CallableStatement)
+     */
+    public ResultSet getResultSet(CallableStatement ps) throws SQLException {
+        boolean isResultSet = ps.execute();
+        while (!isResultSet && ps.getUpdateCount() != -1) {
+            isResultSet = ps.getMoreResults();
+        }
+        ResultSet rs = ps.getResultSet();
+        return rs;
+    }
+    
+    /** 
+     * @see org.hibernate.dialect.Dialect#registerResultSetOutParameter(java.sql.CallableStatement, int)
+     */
+    public int registerResultSetOutParameter(CallableStatement statement,
+                                             int col) throws SQLException {
+        return col;
+    }
+
+	public String getForUpdateNowaitString() {
+		return ""; //$NON-NLS-1$
+	}
+
+	public String getForUpdateNowaitString(String aliases) {
+		return "";		 //$NON-NLS-1$
+	}
+
+	public String getForUpdateString() {
+		return ""; //$NON-NLS-1$
+	}
+
+	public String getForUpdateString(LockMode lockMode) {
+		return ""; //$NON-NLS-1$
+	}
+
+	public String getForUpdateString(String aliases) {
+		return ""; //$NON-NLS-1$
+	}
+	
+	@Override
+	public String getSelectGUIDString() {
+		return "select uuid()"; //$NON-NLS-1$
+	}
+   
+}
+

Added: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/TeiidDialectExt.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/TeiidDialectExt.java	                        (rev 0)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/TeiidDialectExt.java	2011-10-08 13:28:26 UTC (rev 6453)
@@ -0,0 +1,452 @@
+/*
+ * Copyright (C) 2011 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 java.sql.Types;
+
+import org.hibernate.HibernateException;
+
+/**
+ * An extension to the standard Hibernate TeiidDialect dialect
+ * 
+ * @author manningr 
+ */
+public class TeiidDialectExt extends CommonHibernateDialect
+{
+	private class TeiidDialectHelper extends TeiidDialect
+	{
+
+		public TeiidDialectHelper()
+		{
+			super();
+
+			registerColumnType(Types.BIT, "boolean");
+			registerColumnType(Types.BIGINT, "long");
+			registerColumnType(Types.BLOB, "blob");
+			registerColumnType(Types.CHAR, "char");
+			registerColumnType(Types.CLOB, "clob");
+			registerColumnType(Types.DATE, "date");
+			registerColumnType(Types.DOUBLE, "double");
+			registerColumnType(Types.FLOAT, "float");
+			registerColumnType(Types.INTEGER, "integer");
+			registerColumnType(Types.JAVA_OBJECT, "object");
+			registerColumnType(Types.NUMERIC, "bigdecimal"); 
+			registerColumnType(Types.REAL, "float");
+			registerColumnType(Types.SMALLINT, "short");
+			registerColumnType(Types.TIME, "time");
+			registerColumnType(Types.TIMESTAMP, "timestamp");
+			registerColumnType(Types.TINYINT, "byte");
+			registerColumnType(Types.VARBINARY, "blob");
+			registerColumnType(Types.VARCHAR, "string");
+		}
+	}
+	
+	/** extended hibernate dialect used in this wrapper */
+	private TeiidDialectHelper _dialect = new TeiidDialectHelper();
+	
+	/**
+	 * @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()
+	{
+		
+		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 false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAddUniqueConstraint()
+	 */
+	@Override
+	public boolean supportsAddUniqueConstraint()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAlterColumnDefault()
+	 */
+	@Override
+	public boolean supportsAlterColumnDefault()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @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 false;
+	}
+
+	/**
+	 * @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()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateIndex()
+	 */
+	@Override
+	public boolean supportsCreateIndex()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateSequence()
+	 */
+	@Override
+	public boolean supportsCreateSequence()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateTable()
+	 */
+	@Override
+	public boolean supportsCreateTable()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsCreateView()
+	 */
+	@Override
+	public boolean supportsCreateView()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @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 false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropIndex()
+	 */
+	@Override
+	public boolean supportsDropIndex()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropSequence()
+	 */
+	@Override
+	public boolean supportsDropSequence()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropView()
+	 */
+	@Override
+	public boolean supportsDropView()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @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()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsInsertInto()
+	 */
+	@Override
+	public boolean supportsInsertInto()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @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)
+	{
+		return databaseProductName.toLowerCase().startsWith("teiid");
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsRenameColumn()
+	 */
+	@Override
+	public boolean supportsRenameColumn()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsRenameTable()
+	 */
+	@Override
+	public boolean supportsRenameTable()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsRenameView()
+	 */
+	@Override
+	public boolean supportsRenameView()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsSchemasInTableDefinition()
+	 */
+	@Override
+	public boolean supportsSchemasInTableDefinition()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsSequence()
+	 */
+	@Override
+	public boolean supportsSequence()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @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 false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsViewDefinition()
+	 */
+	@Override
+	public boolean supportsViewDefinition()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsSubSecondTimestamps()
+	 */
+	@Override
+	public boolean supportsSubSecondTimestamps()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsAddPrimaryKey()
+	 */
+	@Override
+	public boolean supportsAddPrimaryKey()
+	{
+		
+		return false;
+	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#supportsDropPrimaryKey()
+	 */
+	@Override
+	public boolean supportsDropPrimaryKey()
+	{
+		
+		return false;
+	}
+	
+	
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6452] trunk/sql12/app/src/main/java/net/ sourceforge/squirrel_sql/client/session/BaseSQLEntryPanel.java

[<wi...@us...>]

Revision: 6452
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6452&view=rev
Author:   wis775
Date:     2011-10-07 20:37:03 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
CTRL-Click trigger's a search of the underlying word at the object tree. This should only happen for a single click - not for a double.

Modified Paths:
--------------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/BaseSQLEntryPanel.java

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/BaseSQLEntryPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/BaseSQLEntryPanel.java	2011-10-07 20:00:25 UTC (rev 6451)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/BaseSQLEntryPanel.java	2011-10-07 20:37:03 UTC (rev 6452)
@@ -394,7 +394,7 @@
          */
 		@Override
         public void mouseClicked(MouseEvent e) {
-            if (e.isControlDown()) {
+            if (e.isControlDown() && e.getClickCount() == 1) {
                 
                 final Action a = 
                     _app.getActionCollection().get(ViewObjectAtCursorInObjectTreeAction.class);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6451] trunk/sql12

[<wi...@us...>]

Revision: 6451
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6451&view=rev
Author:   wis775
Date:     2011-10-07 20:00:25 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
Some performance improvements, when searching in the object tree. 
Now, Squirrel will not try to expand a node twice, if no children were found by the expander.

Modified Paths:
--------------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTree.java
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModel.java
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java
    trunk/sql12/doc/src/main/resources/changes.txt

Added Paths:
-----------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoader.java
    trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModelTest.java
    trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoaderTest.java

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTree.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTree.java	2011-10-03 23:59:25 UTC (rev 6450)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTree.java	2011-10-07 20:00:25 UTC (rev 6451)
@@ -21,7 +21,6 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -61,7 +60,6 @@
 import net.sourceforge.squirrel_sql.fw.gui.CursorChanger;
 import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
 import net.sourceforge.squirrel_sql.fw.id.IIdentifier;
-import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
 import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
 import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
 import net.sourceforge.squirrel_sql.fw.sql.ITableInfo;
@@ -544,7 +542,7 @@
 			throw new IllegalArgumentException("ObjectTreeNode == null");
 		}
 		// If node hasn't already been expanded.
-		if (node.getChildCount() == 0)
+		if (node.getChildCount() == 0 && node.hasNoChildrenFoundWithExpander() == false)
 		{
 			// Add together the standard expanders for this node type and any
 			// individual expanders that there are for the node and process them.
@@ -569,7 +567,7 @@
 					System.arraycopy(extraExpanders, 0, expanders, stdExpanders.length,
 										extraExpanders.length);
 				}
-				new TreeLoader(node, expanders, selectNode).execute();
+				new TreeLoader(this._session, this, this._model, node, expanders, selectNode).execute();
 			}
 		}
 	}
@@ -957,133 +955,4 @@
 			}
 		}
 	}
-
-	/**
-	 * This class actually loads the tree.
-	 */
-	private final class TreeLoader
-	{
-		private ObjectTreeNode _parentNode;
-		private INodeExpander[] _expanders;
-		private boolean _selectParentNode;
-
-		TreeLoader(ObjectTreeNode parentNode, INodeExpander[] expanders,
-					boolean selectParentNode)
-		{
-			super();
-			_parentNode = parentNode;
-			_expanders = expanders;
-			_selectParentNode= selectParentNode;
-		}
-
-		void execute()
-		{
-			try
-			{
-				try
-				{
-					ObjectTreeNode loadingNode = showLoadingNode();
-					try
-					{
-						loadChildren();
-					}
-					finally
-					{
-                        if (_parentNode.isNodeChild(loadingNode)){
-                            _parentNode.remove(loadingNode);
-                        }
-					}
-				}
-				finally
-				{
-					fireStructureChanged(_parentNode);
-					if (_selectParentNode)
-					{
-						clearSelection();
-						setSelectionPath(new TreePath(_parentNode.getPath()));
-					}
-				}
-			}
-			catch (Throwable ex)
-			{
-				final String msg = "Error: " + _parentNode.toString();
-				s_log.error(msg, ex);
-				_session.showErrorMessage(msg + ": " + ex.toString());
-			}
-		}
-
-		/**
-		 * This adds a node to the tree that says "Loading..." in order to give
-		 * feedback to the user.
-		 */
-		private ObjectTreeNode showLoadingNode()
-		{
-			IDatabaseObjectInfo doi = new DatabaseObjectInfo(null, null,
-								"Loading...", DatabaseObjectType.OTHER,
-								_session.getSQLConnection().getSQLMetaData());
-			ObjectTreeNode loadingNode = new ObjectTreeNode(_session, doi);
-			_parentNode.add(loadingNode);
-			fireStructureChanged(_parentNode);
-			return loadingNode;
-		}
-
-		/**
-		 * This expands the parent node and shows all its children.
-		 */
-		private void loadChildren() throws SQLException
-		{
-			for (int i = 0; i < _expanders.length; ++i)
-			{
-				boolean nodeTypeAllowsChildren = false;
-				DatabaseObjectType lastDboType = null;
-				List<ObjectTreeNode> list = _expanders[i].createChildren(_session, _parentNode);
-				Iterator<ObjectTreeNode> it = list.iterator();
-				while (it.hasNext())
-				{
-					Object nextObj = it.next();
-					if (nextObj instanceof ObjectTreeNode)
-					{
-						ObjectTreeNode childNode = (ObjectTreeNode)nextObj;
-						if (childNode.getExpanders().length >0)
-						{
-							childNode.setAllowsChildren(true);
-						}
-						else
-						{
-							DatabaseObjectType childNodeDboType = childNode.getDatabaseObjectType();
-							if (childNodeDboType != lastDboType)
-							{
-								getTypedModel().addKnownDatabaseObjectType(childNodeDboType);
-								lastDboType = childNodeDboType;
-								if (_model.getExpanders(childNodeDboType).length > 0)
-								{
-									nodeTypeAllowsChildren = true;
-								}
-								else
-								{
-									nodeTypeAllowsChildren = false;
-								}
-							}
-							childNode.setAllowsChildren(nodeTypeAllowsChildren);
-						}
-						_parentNode.add(childNode);
-					}
-				}
-			}
-		}
-
-		/**
-		 * Let the object tree model know that its structure has changed.
-		 */
-		private void fireStructureChanged(final ObjectTreeNode node)
-		{
-			GUIUtils.processOnSwingEventThread(new Runnable()
-			{
-				public void run()
-				{
-					ObjectTree.this._model.nodeStructureChanged(node);
-				}
-			});
-		}
-	}
 }

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModel.java	2011-10-03 23:59:25 UTC (rev 6450)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModel.java	2011-10-07 20:00:25 UTC (rev 6451)
@@ -279,11 +279,10 @@
       }
       else
       {
-         if(useExpanders && 0 == startNode.getChildCount())
+         if(useExpanders &&  startNode.getAllowsChildren() && 0 == startNode.getChildCount() && startNode.hasNoChildrenFoundWithExpander() == false)
          {
             INodeExpander[] expanders = getExpanders(startNode.getDatabaseObjectType());
 
-
             for (int i = 0; i < expanders.length; i++)
             {
                try
@@ -291,19 +290,23 @@
                   List<ObjectTreeNode> children = 
                       expanders[i].createChildren(startNode.getSession(), startNode);
 
-                  for (int j = 0; j < children.size(); j++)
-                  {
-                     ObjectTreeNode newChild = children.get(j);
-                     if(0 == getExpanders(newChild.getDatabaseObjectType()).length)
-                     {
-                        newChild.setAllowsChildren(false);
-                     }
-                     else
-                     {
-                        newChild.setAllowsChildren(true);
-                     }
+                  if(children.isEmpty()){
+                	  startNode.setNoChildrenFoundWithExpander(true);
+                  }else{
+                	  for (int j = 0; j < children.size(); j++)
+                	  {
+                		  ObjectTreeNode newChild = children.get(j);
+                		  if(0 == getExpanders(newChild.getDatabaseObjectType()).length)
+                		  {
+                			  newChild.setAllowsChildren(false);
+                		  }
+                		  else
+                		  {
+                			  newChild.setAllowsChildren(true);
+                		  }
 
-                     startNode.add(newChild);
+                		  startNode.add(newChild);
+                	  }
                   }
                }
                catch (Exception e)

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java	2011-10-03 23:59:25 UTC (rev 6450)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeNode.java	2011-10-07 20:00:25 UTC (rev 6451)
@@ -56,6 +56,8 @@
 
 	/** Collection of <TT>INodeExpander</TT> objects for this node. */
 	private final List<INodeExpander> _expanders = new ArrayList<INodeExpander>();
+	
+	private boolean noChildrenFoundWithExpander = false;
 
    /**
 	 * Ctor that assumes node cannot have children.
@@ -189,4 +191,18 @@
    {
       return _dboInfo.getDatabaseObjectType().getIcon();
    }
+
+/**
+ * @return the noChildrenFoundWithExpander
+ */
+public boolean hasNoChildrenFoundWithExpander() {
+	return noChildrenFoundWithExpander;
 }
+
+/**
+ * @param noChildrenFoundWithExpander the noChildrenFoundWithExpander to set
+ */
+public void setNoChildrenFoundWithExpander(boolean noChildrenFoundWithExpander) {
+	this.noChildrenFoundWithExpander = noChildrenFoundWithExpander;
+}
+}

Added: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoader.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoader.java	                        (rev 0)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoader.java	2011-10-07 20:00:25 UTC (rev 6451)
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2002-2004 Colin Bell
+ * co...@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 toS the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+package net.sourceforge.squirrel_sql.client.session.mainpanel.objecttree;
+
+import java.sql.SQLException;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.swing.tree.TreePath;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.gui.GUIUtils;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
+import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
+
+/**
+ * This class actually loads the tree.
+ * Note: This class was extracted from {@link ObjectTree} to make it more testable.
+ */
+public class TreeLoader
+{
+	
+	 /** Logger for this class. */
+		private static final ILogger s_log =
+			LoggerController.createLogger(TreeLoader.class);
+		
+	private ObjectTree objectTree;
+	private ObjectTreeNode _parentNode;
+	private INodeExpander[] _expanders;
+	private boolean _selectParentNode;
+	private ObjectTreeModel model;
+	private ISession session;
+
+	TreeLoader(ISession session, ObjectTree objectTree, ObjectTreeModel model, ObjectTreeNode parentNode, INodeExpander[] expanders,
+				boolean selectParentNode)
+	{
+		super();
+		this.session = session;
+		this.objectTree = objectTree;
+		this.model = model;
+		_parentNode = parentNode;
+		_expanders = expanders;
+		_selectParentNode= selectParentNode;
+	}
+
+	void execute()
+	{
+		try
+		{
+			try
+			{
+				ObjectTreeNode loadingNode = showLoadingNode();
+				try
+				{
+					loadChildren();
+				}
+				finally
+				{
+                    if (_parentNode.isNodeChild(loadingNode)){
+                        _parentNode.remove(loadingNode);
+                    }
+				}
+			}
+			finally
+			{
+				fireStructureChanged(_parentNode);
+				if (_selectParentNode)
+				{
+					this.objectTree.clearSelection();
+					this.objectTree.setSelectionPath(new TreePath(_parentNode.getPath()));
+				}
+			}
+		}
+		catch (Throwable ex)
+		{
+			final String msg = "Error: " + _parentNode.toString();
+			s_log.error(msg, ex);
+			this.session.showErrorMessage(msg + ": " + ex.toString());
+		}
+	}
+
+	/**
+	 * This adds a node to the tree that says "Loading..." in order to give
+	 * feedback to the user.
+	 */
+	private ObjectTreeNode showLoadingNode()
+	{
+		IDatabaseObjectInfo doi = new DatabaseObjectInfo(null, null,
+							"Loading...", DatabaseObjectType.OTHER,
+							this.session.getSQLConnection().getSQLMetaData());
+		ObjectTreeNode loadingNode = new ObjectTreeNode(this.session, doi);
+		_parentNode.add(loadingNode);
+		fireStructureChanged(_parentNode);
+		return loadingNode;
+	}
+
+	/**
+	 * This expands the parent node and shows all its children.
+	 */
+	private void loadChildren() throws SQLException
+	{
+		boolean noChildrenFound = true;
+		for (int i = 0; i < _expanders.length; ++i)
+		{
+			boolean nodeTypeAllowsChildren = false;
+			DatabaseObjectType lastDboType = null;
+			List<ObjectTreeNode> list = _expanders[i].createChildren(this.session, _parentNode);
+			
+			if(list.isEmpty() == false){
+				noChildrenFound = false;
+			}
+			
+			Iterator<ObjectTreeNode> it = list.iterator();
+			while (it.hasNext())
+			{
+				Object nextObj = it.next();
+				if (nextObj instanceof ObjectTreeNode)
+				{
+					ObjectTreeNode childNode = (ObjectTreeNode)nextObj;
+					if (childNode.getExpanders().length >0)
+					{
+						childNode.setAllowsChildren(true);
+					}
+					else
+					{
+						DatabaseObjectType childNodeDboType = childNode.getDatabaseObjectType();
+						if (childNodeDboType != lastDboType)
+						{
+							this.objectTree.getTypedModel().addKnownDatabaseObjectType(childNodeDboType);
+							lastDboType = childNodeDboType;
+							if (this.model.getExpanders(childNodeDboType).length > 0)
+							{
+								nodeTypeAllowsChildren = true;
+							}
+							else
+							{
+								nodeTypeAllowsChildren = false;
+							}
+						}
+						childNode.setAllowsChildren(nodeTypeAllowsChildren);
+					}
+					_parentNode.add(childNode);
+				}
+			}
+		}
+
+		// We cann't use getChildCount, because the node has a temporary child called "Loading..."
+		_parentNode.setNoChildrenFoundWithExpander(noChildrenFound);
+	}
+
+	/**
+	 * Let the object tree model know that its structure has changed.
+	 */
+	private void fireStructureChanged(final ObjectTreeNode node)
+	{
+		GUIUtils.processOnSwingEventThread(new Runnable()
+		{
+			public void run()
+			{
+				model.nodeStructureChanged(node);
+			}
+		});
+	}
+}
\ No newline at end of file


Property changes on: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoader.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModelTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModelTest.java	                        (rev 0)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModelTest.java	2011-10-07 20:00:25 UTC (rev 6451)
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@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.mainpanel.objecttree;
+
+import static org.easymock.classextension.EasyMock.expect;
+
+import java.util.ArrayList;
+
+import javax.swing.tree.TreePath;
+
+import org.easymock.classextension.EasyMock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase;
+import net.sourceforge.squirrel_sql.client.AppTestUtil;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.client.session.SessionManager;
+import net.sourceforge.squirrel_sql.client.session.schemainfo.FilterMatcher;
+import net.sourceforge.squirrel_sql.fw.FwTestUtil;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+
+/**
+ * Some Tests about the ObjectTreeModel.
+ * @author Stefan Willinger
+ *
+ */
+public class ObjectTreeModelTest extends BaseSQuirreLTestCase {
+
+    private ISession session = null;
+    private ObjectTreeModel classUnderTest = null;
+    private IDatabaseObjectInfo mockDbInfo = null;
+
+    @Before
+    protected void setUp() throws Exception {
+        super.setUp();
+        session = AppTestUtil.getEasyMockSession("Oracle");
+        classUnderTest = new ObjectTreeModel(session);
+        
+        SessionManager mockSessionManager = session.getApplication().getSessionManager();
+    	
+    	// redefine the mockSessionManager, to know our mockSession.
+    	EasyMock.resetToDefault(mockSessionManager);
+    	EasyMock.expect(mockSessionManager.getSession(session.getIdentifier())).andReturn(session).anyTimes();
+    	EasyMock.replay(mockSessionManager);
+    	
+    	 mockDbInfo = 
+    	            FwTestUtil.getEasyMockDatabaseObjectInfo("catalog", 
+    	                                                   "schema", 
+    	                                                   "table", 
+    	                                                   "schema.table",
+    	                                                   DatabaseObjectType.TABLE);
+    }
+
+    @After
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+    
+    /**
+     * Ensure, that the expander is not called twice to fetch the children, if no children exists.
+     */
+    @Test
+    public void testPathToDBInfo_NoChildrensFoundByExpander() throws Exception {
+        
+        ObjectTreeNode node = new ObjectTreeNode(session, mockDbInfo);
+        
+        INodeExpander mockExpander = EasyMock.createMock(INodeExpander.class);
+        // Simulate, that a expander didn't find any children.
+        expect(mockExpander.createChildren(session, node)).andReturn(new ArrayList<ObjectTreeNode>());
+
+		EasyMock.replay(mockExpander);
+       
+       classUnderTest.addExpander(node.getDatabaseObjectType(), mockExpander);
+       FilterMatcher matcher = new FilterMatcher("xy", null);
+       TreePath treePath = classUnderTest.getPathToDbInfo(mockDbInfo.getCatalogName(), mockDbInfo.getSchemaName(), matcher , node, true);
+       assertNull(treePath);
+       // after the first call, the node must know, that expanders didn't find any children.
+       assertTrue(node.hasNoChildrenFoundWithExpander());
+       
+       // Try it a second time.
+       treePath = classUnderTest.getPathToDbInfo(mockDbInfo.getCatalogName(), mockDbInfo.getSchemaName(), matcher , node, true);
+       assertNull(treePath);
+       
+       // Verify, that the expander is only called once.
+       EasyMock.verify(mockExpander);
+        
+    }
+    
+    /**
+     * Ensure, that the expander is not called, if the node is already marked with "NoChildrenFoundWithExpander".
+     */
+    @Test
+    public void testPathToDBInfo_AlreadyNoChildrensFoundByExpander() throws Exception {
+    	
+      
+        ObjectTreeNode node = new ObjectTreeNode(session, mockDbInfo);
+        node.setNoChildrenFoundWithExpander(true);
+        
+        INodeExpander mockExpander = EasyMock.createMock(INodeExpander.class);
+		EasyMock.replay(mockExpander);
+       
+       classUnderTest.addExpander(node.getDatabaseObjectType(), mockExpander);
+       FilterMatcher matcher = new FilterMatcher("xy", null);
+       TreePath treePath = classUnderTest.getPathToDbInfo(mockDbInfo.getCatalogName(), mockDbInfo.getSchemaName(), matcher , node, true);
+       assertNull(treePath);
+       
+       treePath = classUnderTest.getPathToDbInfo(mockDbInfo.getCatalogName(), mockDbInfo.getSchemaName(), matcher , node, true);
+       assertNull(treePath);
+       
+       // Verify, that the expander is not called
+		EasyMock.verify(mockExpander);
+
+	}
+}


Property changes on: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/ObjectTreeModelTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Added: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoaderTest.java
===================================================================
--- trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoaderTest.java	                        (rev 0)
+++ trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoaderTest.java	2011-10-07 20:00:25 UTC (rev 6451)
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@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.mainpanel.objecttree;
+
+import static org.easymock.EasyMock.expect;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase;
+import net.sourceforge.squirrel_sql.client.AppTestUtil;
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.FwTestUtil;
+import net.sourceforge.squirrel_sql.fw.sql.DatabaseObjectType;
+import net.sourceforge.squirrel_sql.fw.sql.IDatabaseObjectInfo;
+import net.sourceforge.squirrel_sql.fw.sql.ISQLConnection;
+import net.sourceforge.squirrel_sql.fw.sql.SQLDatabaseMetaData;
+
+import org.easymock.classextension.EasyMock;
+import org.junit.Before;
+
+/**
+ * @author Stefan Willinger
+ * 
+ */
+public class TreeLoaderTest extends BaseSQuirreLTestCase {
+	private ISession mockSession = null;
+	private IDatabaseObjectInfo mockDbInfo = null;
+
+	/**
+	 * @throws java.lang.Exception
+	 */
+	@Before
+	public void setUp() throws Exception {
+		mockSession = AppTestUtil.getEasyMockSession("Oracle");
+		mockDbInfo = FwTestUtil.getEasyMockDatabaseObjectInfo("catalog", "schema", "table", "schema.table",
+				DatabaseObjectType.TABLE);
+	}
+
+	/**
+	 * Ensure, that a node is marked with"NoChildrenFoundWithExpander" if a
+	 * expander didn't find any children for this node.
+	 */
+	public void testNoChildrenFoundByExpander() throws Exception {
+
+		ObjectTreeNode node = new ObjectTreeNode(mockSession, mockDbInfo);
+
+		INodeExpander mockExpander = EasyMock.createMock(INodeExpander.class);
+		// Simulate, that a expander didn't find any children.
+		expect(mockExpander.createChildren(mockSession, node)).andReturn(new ArrayList<ObjectTreeNode>());
+
+		// redefine the mockConnection
+		ISQLConnection mockConnection = mockSession.getSQLConnection();
+		EasyMock.resetToDefault(mockConnection);
+		SQLDatabaseMetaData mockMetadata = EasyMock.createNiceMock(SQLDatabaseMetaData.class);
+		EasyMock.expect(mockConnection.getSQLMetaData()).andReturn(mockMetadata);
+		EasyMock.replay(mockConnection);
+		EasyMock.replay(mockMetadata);
+
+		ObjectTree mockObjectTree = EasyMock.createMock(ObjectTree.class);
+
+		ObjectTreeModel mockModel = EasyMock.createMock(ObjectTreeModel.class);
+
+		EasyMock.replay(mockExpander, mockObjectTree);
+
+		TreeLoader classUnderTest = new TreeLoader(mockSession, mockObjectTree, mockModel, node,
+				new INodeExpander[] { mockExpander }, false);
+
+		classUnderTest.execute();
+
+		assertTrue(node.hasNoChildrenFoundWithExpander());
+	}
+
+	/**
+	 * Ensure, that a node is not marked with"NoChildrenFoundWithExpander" if a
+	 * expander find a child node
+	 */
+	public void testChildrenFoundByExpander() throws Exception {
+		// The parent node
+		ObjectTreeNode node = new ObjectTreeNode(mockSession, mockDbInfo);
+
+		// Simulate, that a expander didn't find any children.
+		INodeExpander mockExpander = EasyMock.createMock(INodeExpander.class);
+		List<ObjectTreeNode> childs = new ArrayList<ObjectTreeNode>();
+		childs.add(new ObjectTreeNode(mockSession, mockDbInfo));
+		expect(mockExpander.createChildren(mockSession, node)).andReturn(childs);
+
+
+		// Setup some infrastucture
+		ISQLConnection mockConnection = mockSession.getSQLConnection();
+		EasyMock.resetToDefault(mockConnection);
+		SQLDatabaseMetaData mockMetadata = EasyMock.createNiceMock(SQLDatabaseMetaData.class);
+		EasyMock.expect(mockConnection.getSQLMetaData()).andReturn(mockMetadata);
+		EasyMock.replay(mockConnection);
+		EasyMock.replay(mockMetadata);
+
+
+		// Setup a ObjectTree with a Model
+		ObjectTree mockObjectTree = EasyMock.createMock(ObjectTree.class);
+		ObjectTreeModel mockModel = EasyMock.createNiceMock(ObjectTreeModel.class);
+		EasyMock.expect(mockModel.getExpanders(childs.get(0).getDatabaseObjectType())).andReturn(
+				new INodeExpander[] {});
+		// We need the mock thread save, because some methods will be called at
+		// the AWT-Event thread.
+		EasyMock.makeThreadSafe(mockModel, true);
+
+		EasyMock.expect(mockObjectTree.getTypedModel()).andReturn(mockModel);
+
+		EasyMock.replay(mockExpander, mockObjectTree, mockModel);
+
+		// Create a Treeloader
+		TreeLoader classUnderTest = new TreeLoader(mockSession, mockObjectTree, mockModel, node,
+				new INodeExpander[] { mockExpander }, false);
+
+		classUnderTest.execute();
+
+		// The expander found some childs.
+		assertFalse(node.hasNoChildrenFoundWithExpander());
+		
+		// Because we didn't specify a expander for the new child
+		assertFalse(childs.get(0).getAllowsChildren());
+	}
+
+}


Property changes on: trunk/sql12/app/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/TreeLoaderTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2011-10-03 23:59:25 UTC (rev 6450)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2011-10-07 20:00:25 UTC (rev 6451)
@@ -7,6 +7,9 @@
 
 Enhancements:
 
+Some performance improvements, when searching in the object tree. 
+	Now, Squirrel will not try to expand a node twice, if no children were found for a node at a previous search. 
+
 Updated Translations:
  * French (Erwan Duroselle)
  

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6450] trunk/sql12/plugins/mysql/src/main/java/net /sourceforge/squirrel_sql/plugins/mysql/tab/ShowLogsTab.java

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

Revision: 6450
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6450&view=rev
Author:   manningr
Date:     2011-10-03 23:59:25 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
added comment regarding how this tab won't work in MySQL 5.  Need to figure out an equivalent way to find this info for MySQL 5.

Modified Paths:
--------------
    trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/ShowLogsTab.java

Modified: trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/ShowLogsTab.java
===================================================================
--- trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/ShowLogsTab.java	2011-10-03 23:53:36 UTC (rev 6449)
+++ trunk/sql12/plugins/mysql/src/main/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/ShowLogsTab.java	2011-10-03 23:59:25 UTC (rev 6450)
@@ -50,6 +50,11 @@
 
 	protected String getSQL()
 	{
+		// This does not work on MySQL 5 (it's deprecated).  Need an appropriate substitute.
+		// if (super.getDialectType() == DialectType.MYSQL) {
 		return "show logs";
+	   // } else if (super.getDialectType() == DialectType.MYSQL5) {
+		    // ????
+		// }
 	}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6449] trunk/sql12/fw/src/main/java/net/ sourceforge/squirrel_sql/fw/dialects/SybaseDialectExt.java

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

Revision: 6449
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6449&view=rev
Author:   manningr
Date:     2011-10-03 23:53:36 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Added NULL keyword support.

Modified Paths:
--------------
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/SybaseDialectExt.java

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/SybaseDialectExt.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/SybaseDialectExt.java	2011-10-02 19:00:56 UTC (rev 6448)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/dialects/SybaseDialectExt.java	2011-10-03 23:53:36 UTC (rev 6449)
@@ -1113,5 +1113,14 @@
 	{
 		return "0x" + DialectUtils.toHexString(binaryData);
 	}
+
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.dialects.CommonHibernateDialect#getNullColumnString()
+	 */
+	@Override
+	public String getNullColumnString()
+	{
+		return " NULL";
+	}
 	
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6448] trunk/sql12/plugins/ squirrelsql-plugin-archetype/pom.xml

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

Revision: 6448
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6448&view=rev
Author:   manningr
Date:     2011-10-02 19:00:56 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-10-02 19:00:52 UTC (rev 6447)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-10-02 19:00:56 UTC (rev 6448)
@@ -11,7 +11,7 @@
 
 	<groupId>net.sf.squirrel-sql.plugins</groupId>
 	<artifactId>squirrelsql-plugin-archetype</artifactId>
-	<version>3.3.0-rc3</version>
+	<version>3.3.0-SNAPSHOT</version>
 	<packaging>maven-archetype</packaging>
 
 	<name>SQuirreL Plugin Archetype</name>
@@ -47,9 +47,9 @@
 	</licenses>
 	<url>http://www.squirrelsql.org/</url>
 	<scm>
-		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc3</connection>
-		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc3</developerConnection>
-		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc3</url>
+		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</connection>
+		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</developerConnection>
+		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</url>
 	</scm>
 	<issueManagement>
 		<system>SourceForge Tracker</system>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6447] tags/squirrelsql-plugin-archetype-3.3.0-rc3 /

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

Revision: 6447
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6447&view=rev
Author:   manningr
Date:     2011-10-02 19:00:52 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
[maven-release-plugin]  copy for tag squirrelsql-plugin-archetype-3.3.0-rc3

Added Paths:
-----------
    tags/squirrelsql-plugin-archetype-3.3.0-rc3/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6446] trunk/sql12/plugins/ squirrelsql-plugin-archetype/pom.xml

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

Revision: 6446
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6446&view=rev
Author:   manningr
Date:     2011-10-02 19:00:43 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
[maven-release-plugin] prepare release squirrelsql-plugin-archetype-3.3.0-rc3

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-10-02 18:21:48 UTC (rev 6445)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-10-02 19:00:43 UTC (rev 6446)
@@ -11,7 +11,7 @@
 
 	<groupId>net.sf.squirrel-sql.plugins</groupId>
 	<artifactId>squirrelsql-plugin-archetype</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.0-rc3</version>
 	<packaging>maven-archetype</packaging>
 
 	<name>SQuirreL Plugin Archetype</name>
@@ -47,9 +47,9 @@
 	</licenses>
 	<url>http://www.squirrelsql.org/</url>
 	<scm>
-		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</connection>
-		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</developerConnection>
-		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</url>
+		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc3</connection>
+		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc3</developerConnection>
+		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc3</url>
 	</scm>
 	<issueManagement>
 		<system>SourceForge Tracker</system>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6445] trunk/sql12/plugins/ squirrelsql-plugin-archetype/pom.xml

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

Revision: 6445
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6445&view=rev
Author:   manningr
Date:     2011-10-02 18:21:48 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
Removed no longer needed m2e profile. Also removed distributionManagement as this is inherited from the sonatype parent pom.

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-10-02 18:02:36 UTC (rev 6444)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-10-02 18:21:48 UTC (rev 6445)
@@ -133,70 +133,7 @@
 					<streamLogs>true</streamLogs>
 				</configuration>
 			</plugin>
-
-
 		</plugins>
 	</build>
 
-	<distributionManagement>
-		<repository>
-			<id>sonatype-nexus-staging</id>
-			<name>Nexus Release Repository</name>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-		<snapshotRepository>
-			<id>sonatype-nexus-snapshots</id>
-			<name>Sonatype Nexus Snapshots</name>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-	</distributionManagement>
-
-	<profiles>
-		<profile>
-			<id>m2e</id>
-
-			<!--This plugin's configuration is used to store Eclipse m2e settings 
-				only. It has no influence on the Maven build itself. -->
-			<build>
-				<pluginManagement>
-					<plugins>
-						<plugin>
-							<groupId>org.eclipse.m2e</groupId>
-							<artifactId>lifecycle-mapping</artifactId>
-							<version>1.0.0</version>
-							<configuration>
-								<lifecycleMappingMetadata>
-									<pluginExecutions>
-										<pluginExecution>
-											<pluginExecutionFilter>
-												<groupId>
-													org.apache.maven.plugins
-												</groupId>
-												<artifactId>
-													maven-dependency-plugin
-												</artifactId>
-												<versionRange>
-													[2.1,)
-												</versionRange>
-												<goals>
-													<goal>
-														unpack-dependencies
-													</goal>
-												</goals>
-											</pluginExecutionFilter>
-											<action>
-												<ignore />
-											</action>
-										</pluginExecution>
-									</pluginExecutions>
-								</lifecycleMappingMetadata>
-							</configuration>
-						</plugin>
-					</plugins>
-				</pluginManagement>
-			</build>
-		</profile>
-	</profiles>
-
-
 </project>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6444] trunk/sql12/plugins/ squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml

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

Revision: 6444
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6444&view=rev
Author:   manningr
Date:     2011-10-02 18:02:36 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
fixed pluginClassName for launch profile

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml	2011-09-29 00:43:49 UTC (rev 6443)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/src/main/resources/archetype-resources/pom.xml	2011-10-02 18:02:36 UTC (rev 6444)
@@ -99,7 +99,7 @@
 		</dependency>
 	</dependencies>
 	<properties>
-		<pluginClassName>net.sourceforge.squirrel_sql.plugins.example.ExamplePlugin</pluginClassName>
+		<pluginClassName>${package}.${pluginName}Plugin</pluginClassName>
 	</properties>
 	<build>
 		<plugins>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6443] trunk/sql12/plugins/ squirrelsql-plugin-archetype/pom.xml

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

Revision: 6443
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6443&view=rev
Author:   manningr
Date:     2011-09-29 00:43:49 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:43:45 UTC (rev 6442)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:43:49 UTC (rev 6443)
@@ -11,7 +11,7 @@
 
 	<groupId>net.sf.squirrel-sql.plugins</groupId>
 	<artifactId>squirrelsql-plugin-archetype</artifactId>
-	<version>3.3.0-rc2</version>
+	<version>3.3.0-SNAPSHOT</version>
 	<packaging>maven-archetype</packaging>
 
 	<name>SQuirreL Plugin Archetype</name>
@@ -47,9 +47,9 @@
 	</licenses>
 	<url>http://www.squirrelsql.org/</url>
 	<scm>
-		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2</connection>
-		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2</developerConnection>
-		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2</url>
+		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</connection>
+		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</developerConnection>
+		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</url>
 	</scm>
 	<issueManagement>
 		<system>SourceForge Tracker</system>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6442] tags/squirrelsql-plugin-archetype-3.3.0-rc2 /

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

Revision: 6442
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6442&view=rev
Author:   manningr
Date:     2011-09-29 00:43:45 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
[maven-release-plugin]  copy for tag squirrelsql-plugin-archetype-3.3.0-rc2

Added Paths:
-----------
    tags/squirrelsql-plugin-archetype-3.3.0-rc2/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6441] trunk/sql12/plugins/ squirrelsql-plugin-archetype/pom.xml

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

Revision: 6441
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6441&view=rev
Author:   manningr
Date:     2011-09-29 00:43:37 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
[maven-release-plugin] prepare release squirrelsql-plugin-archetype-3.3.0-rc2

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:42:15 UTC (rev 6440)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:43:37 UTC (rev 6441)
@@ -11,7 +11,7 @@
 
 	<groupId>net.sf.squirrel-sql.plugins</groupId>
 	<artifactId>squirrelsql-plugin-archetype</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.0-rc2</version>
 	<packaging>maven-archetype</packaging>
 
 	<name>SQuirreL Plugin Archetype</name>
@@ -47,9 +47,9 @@
 	</licenses>
 	<url>http://www.squirrelsql.org/</url>
 	<scm>
-		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</connection>
-		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</developerConnection>
-		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</url>
+		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2</connection>
+		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2</developerConnection>
+		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2</url>
 	</scm>
 	<issueManagement>
 		<system>SourceForge Tracker</system>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6440] trunk/sql12/plugins/ squirrelsql-plugin-archetype/pom.xml

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

Revision: 6440
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6440&view=rev
Author:   manningr
Date:     2011-09-29 00:42:15 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
svn tag fail - resetting for new release

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:39:51 UTC (rev 6439)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:42:15 UTC (rev 6440)
@@ -11,7 +11,7 @@
 
 	<groupId>net.sf.squirrel-sql.plugins</groupId>
 	<artifactId>squirrelsql-plugin-archetype</artifactId>
-	<version>3.3.0-rc2</version>
+	<version>3.3.0-SNAPSHOT</version>
 	<packaging>maven-archetype</packaging>
 
 	<name>SQuirreL Plugin Archetype</name>
@@ -47,10 +47,9 @@
 	</licenses>
 	<url>http://www.squirrelsql.org/</url>
 	<scm>
-		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2-2</connection>
-		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2-2</developerConnection>
-		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2-2
-		</url>
+		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</connection>
+		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</developerConnection>
+		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/trunk/sql12/plugins/squirrelsql-plugin-archetype</url>
 	</scm>
 	<issueManagement>
 		<system>SourceForge Tracker</system>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6439] trunk/sql12/plugins/ squirrelsql-plugin-archetype/pom.xml

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

Revision: 6439
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6439&view=rev
Author:   manningr
Date:     2011-09-29 00:39:51 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
[maven-release-plugin] prepare release squirrelsql-plugin-archetype-3.3.0-rc2-2

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:38:58 UTC (rev 6438)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:39:51 UTC (rev 6439)
@@ -11,7 +11,7 @@
 
 	<groupId>net.sf.squirrel-sql.plugins</groupId>
 	<artifactId>squirrelsql-plugin-archetype</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.0-rc2</version>
 	<packaging>maven-archetype</packaging>
 
 	<name>SQuirreL Plugin Archetype</name>
@@ -47,9 +47,9 @@
 	</licenses>
 	<url>http://www.squirrelsql.org/</url>
 	<scm>
-		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2</connection>
-		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2</developerConnection>
-		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2
+		<connection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2-2</connection>
+		<developerConnection>scm:svn:https://squirrel-sql.svn.sourceforge.net/svnroot/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2-2</developerConnection>
+		<url>http://squirrel-sql.svn.sourceforge.net/viewvc/squirrel-sql/tags/squirrelsql-plugin-archetype-3.3.0-rc2-2
 		</url>
 	</scm>
 	<issueManagement>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6438] trunk/sql12/plugins/ squirrelsql-plugin-archetype/pom.xml

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

Revision: 6438
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6438&view=rev
Author:   manningr
Date:     2011-09-29 00:38:58 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
svn tag fail - resetting for new release

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:25:10 UTC (rev 6437)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:38:58 UTC (rev 6438)
@@ -11,7 +11,7 @@
 
 	<groupId>net.sf.squirrel-sql.plugins</groupId>
 	<artifactId>squirrelsql-plugin-archetype</artifactId>
-	<version>3.3.0-rc2</version>
+	<version>3.3.0-SNAPSHOT</version>
 	<packaging>maven-archetype</packaging>
 
 	<name>SQuirreL Plugin Archetype</name>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6437] trunk/sql12/plugins/ squirrelsql-plugin-archetype/pom.xml

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

Revision: 6437
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6437&view=rev
Author:   manningr
Date:     2011-09-29 00:25:10 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
[maven-release-plugin] prepare release squirrelsql-plugin-archetype-3.3.0-rc2

Modified Paths:
--------------
    trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml

Modified: trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml
===================================================================
--- trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:18:50 UTC (rev 6436)
+++ trunk/sql12/plugins/squirrelsql-plugin-archetype/pom.xml	2011-09-29 00:25:10 UTC (rev 6437)
@@ -11,7 +11,7 @@
 
 	<groupId>net.sf.squirrel-sql.plugins</groupId>
 	<artifactId>squirrelsql-plugin-archetype</artifactId>
-	<version>3.3.0-SNAPSHOT</version>
+	<version>3.3.0-rc2</version>
 	<packaging>maven-archetype</packaging>
 
 	<name>SQuirreL Plugin Archetype</name>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6436] tags/squirrelsql-plugin-archetype-3.3.0-rc2 /

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

Revision: 6436
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6436&view=rev
Author:   manningr
Date:     2011-09-29 00:18:50 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
prepare for updated release

Removed Paths:
-------------
    tags/squirrelsql-plugin-archetype-3.3.0-rc2/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.