[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5580] trunk/sql12/plugins/cache/src/de/ixdb/ squirrel_sql/plugins/cache

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

Revision: 5580
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5580&view=rev
Author:   gerdwagner
Date:     2010-04-22 20:15:37 +0000 (Thu, 22 Apr 2010)

Log Message:
-----------
Little bit of 2008

Modified Paths:
--------------
    trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptCdlCommand.java
    trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptFunctionCommand.java
    trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowProcessesCommand.java

Added Paths:
-----------
    trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/I18NStrings.properties
    trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/VersionInfo.java

Copied: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/I18NStrings.properties (from rev 5579, trunk/sql12/plugins/firebird/src/org/firebirdsql/squirrel/I18NStrings.properties)
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/I18NStrings.properties	                        (rev 0)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/I18NStrings.properties	2010-04-22 20:15:37 UTC (rev 5580)
@@ -0,0 +1 @@
+cache.VersionInfo.unsupported=This function is not supported in Cache Version higher than 5
\ No newline at end of file

Modified: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptCdlCommand.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptCdlCommand.java	2010-04-17 15:10:11 UTC (rev 5579)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptCdlCommand.java	2010-04-22 20:15:37 UTC (rev 5580)
@@ -31,6 +31,13 @@
 
    public void execute()
    {
+      if(false == VersionInfo.is5(_session))
+      {
+         VersionInfo.showNotSupported(_session);
+         return;
+      }
+
+
       String names = getSelectedNames();
 
       if(null == names || 0 == names.trim().length())

Modified: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptFunctionCommand.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptFunctionCommand.java	2010-04-17 15:10:11 UTC (rev 5579)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ScriptFunctionCommand.java	2010-04-22 20:15:37 UTC (rev 5580)
@@ -30,6 +30,13 @@
 
    public void execute()
    {
+      if(false == VersionInfo.is5(_session))
+      {
+         VersionInfo.showNotSupported(_session);
+         return;
+      }
+      
+
       String[] funcNames = getSelectedFunctions();
 
       if(0 == funcNames.length)

Modified: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowProcessesCommand.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowProcessesCommand.java	2010-04-17 15:10:11 UTC (rev 5579)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/ShowProcessesCommand.java	2010-04-22 20:15:37 UTC (rev 5580)
@@ -70,6 +70,13 @@
    {
       try
       {
+
+         if(false == VersionInfo.is5(_session))
+         {
+            VersionInfo.showNotSupported(_session);
+            return 1;
+         }
+         
          Database conn =  (JBindDatabase) CacheDatabase.getDatabase(session.getSQLConnection().getConnection());
 
          Id id = new Id(processData.pid);
@@ -99,7 +106,17 @@
       throws CacheException, SQLException
    {
       Database conn =  (JBindDatabase) CacheDatabase.getDatabase(session.getSQLConnection().getConnection());
-      CacheQuery qryNamespaces = new CacheQuery(conn, "%SYSTEM.Process", "CONTROLPANEL");
+      CacheQuery qryNamespaces;
+
+      if (VersionInfo.is5(_session))
+      {
+         qryNamespaces = new CacheQuery(conn, "%SYSTEM.Process", "CONTROLPANEL");
+      }
+      else
+      {
+         qryNamespaces = new CacheQuery(conn, "%SYS.ProcessQuery", "CONTROLPANEL");
+      }
+
       ResultSet procList = qryNamespaces.execute(new Object[]{"*"});
 
       Vector procData = new Vector();
@@ -110,9 +127,12 @@
 
       ProcessData[] ret = (ProcessData[]) procData.toArray(new ProcessData[procData.size()]);
 
-      fillLocks(ret);
+      if (VersionInfo.is5(_session))
+      {
+         fillLocks(ret);
 
-      fillBlocksAndDeadLocks(ret);
+         fillBlocksAndDeadLocks(ret);
+      }
 
 
       return ret;

Added: trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/VersionInfo.java
===================================================================
--- trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/VersionInfo.java	                        (rev 0)
+++ trunk/sql12/plugins/cache/src/de/ixdb/squirrel_sql/plugins/cache/VersionInfo.java	2010-04-22 20:15:37 UTC (rev 5580)
@@ -0,0 +1,32 @@
+package de.ixdb.squirrel_sql.plugins.cache;
+
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.fw.util.StringManager;
+import net.sourceforge.squirrel_sql.fw.util.StringManagerFactory;
+
+import javax.swing.*;
+import java.sql.SQLException;
+
+public class VersionInfo
+{
+   private static final StringManager s_stringMgr = StringManagerFactory.getStringManager(VersionInfo.class);
+
+
+   static boolean is5(ISession session)
+   {
+      try
+      {
+         return 5 == session.getMetaData().getDatabaseMajorVersion();
+      }
+      catch (SQLException e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+
+   public static void showNotSupported(ISession session)
+   {
+      JOptionPane.showMessageDialog(session.getApplication().getMainFrame(), s_stringMgr.getString("cache.VersionInfo.unsupported"));
+
+   }
+}


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