manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1221055 - in /incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core: database/ interfaces/
Date Tue, 20 Dec 2011 00:58:45 GMT
Author: kwright
Date: Tue Dec 20 00:58:45 2011
New Revision: 1221055

URL: http://svn.apache.org/viewvc?rev=1221055&view=rev
Log:
Finish the getTableIndexes() debugging

Modified:
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/BaseTable.java
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
    incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IDBInterface.java

Modified: incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/BaseTable.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/BaseTable.java?rev=1221055&r1=1221054&r2=1221055&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/BaseTable.java
(original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/BaseTable.java
Tue Dec 20 00:58:45 2011
@@ -153,7 +153,7 @@ public class BaseTable
   public void performRemoveIndex(String indexName)
     throws ManifoldCFException
   {
-    dbInterface.performRemoveIndex(indexName);
+    dbInterface.performRemoveIndex(indexName,tableName);
   }
 
   /** Analyze this table.

Modified: incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java?rev=1221055&r1=1221054&r2=1221055&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
(original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceDerby.java
Tue Dec 20 00:58:45 2011
@@ -538,8 +538,9 @@ public class DBInterfaceDerby extends Da
 
   /** Remove an index.
   *@param indexName is the name of the index to remove.
+  *@param tableName is the table the index belongs to.
   */
-  public void performRemoveIndex(String indexName)
+  public void performRemoveIndex(String indexName, String tableName)
     throws ManifoldCFException
   {
     performModification("DROP INDEX "+indexName,null,null);
@@ -672,7 +673,7 @@ public class DBInterfaceDerby extends Da
           {
             String indexName = iter.next();
             IndexDescription id = x.get(indexName);
-            performRemoveIndex(indexName);
+            performRemoveIndex(indexName,tableName);
             performAddIndex(indexName,tableName,id);
           }
           break;

Modified: incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java?rev=1221055&r1=1221054&r2=1221055&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
(original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceHSQLDB.java
Tue Dec 20 00:58:45 2011
@@ -551,8 +551,9 @@ public class DBInterfaceHSQLDB extends D
 
   /** Remove an index.
   *@param indexName is the name of the index to remove.
+  *@param tableName is the table the index belongs to.
   */
-  public void performRemoveIndex(String indexName)
+  public void performRemoveIndex(String indexName, String tableName)
     throws ManifoldCFException
   {
     performModification("DROP INDEX "+indexName,null,null);

Modified: incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java?rev=1221055&r1=1221054&r2=1221055&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
(original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfaceMySQL.java
Tue Dec 20 00:58:45 2011
@@ -411,13 +411,12 @@ public class DBInterfaceMySQL extends Da
 
   /** Remove an index.
   *@param indexName is the name of the index to remove.
+  *@param tableName is the table the index belongs to.
   */
-  public void performRemoveIndex(String indexName)
+  public void performRemoveIndex(String indexName, String tableName)
     throws ManifoldCFException
   {
-    // MHL; we need the table name too.
-    System.out.println("Dropping index "+indexName);
-    //performModification("DROP INDEX "+indexName,null,null);
+    performModification("DROP INDEX "+indexName+" ON "+tableName,null,null);
   }
 
   /** Analyze a table.
@@ -614,7 +613,7 @@ public class DBInterfaceMySQL extends Da
         isUnique = false;
       }
       indexColumns.add(columnName);
-      isUnique = nonUnique.equals("false");
+      isUnique = nonUnique.equals("0");
     }
     
     if (lastIndexName != null)

Modified: incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java?rev=1221055&r1=1221054&r2=1221055&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
(original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/database/DBInterfacePostgreSQL.java
Tue Dec 20 00:58:45 2011
@@ -496,8 +496,9 @@ public class DBInterfacePostgreSQL exten
 
   /** Remove an index.
   *@param indexName is the name of the index to remove.
+  *@param tableName is the table the index belongs to.
   */
-  public void performRemoveIndex(String indexName)
+  public void performRemoveIndex(String indexName, String tableName)
     throws ManifoldCFException
   {
     performModification("DROP INDEX "+indexName,null,null);

Modified: incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IDBInterface.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IDBInterface.java?rev=1221055&r1=1221054&r2=1221055&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IDBInterface.java
(original)
+++ incubator/lcf/branches/CONNECTORS-314/framework/core/src/main/java/org/apache/manifoldcf/core/interfaces/IDBInterface.java
Tue Dec 20 00:58:45 2011
@@ -145,8 +145,9 @@ public interface IDBInterface
 
   /** Remove an index.
   *@param indexName is the name of the index to remove.
+  *@param tableName is the table the index belongs to.
   */
-  public void performRemoveIndex(String indexName)
+  public void performRemoveIndex(String indexName, String tableName)
     throws ManifoldCFException;
 
   /** Analyze a table.



Mime
View raw message