Fixed Bug<a href="http://sourceforge.net/tracker/?func=detail&atid=484801&aid=1145683...

[phpeclipse.git] / archive / net.sourceforge.phpeclipse.sql / src / net / sourceforge / phpdt / sql / wizards / PHPUpdateRowPage.java

diff --git a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPUpdateRowPage.java b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPUpdateRowPage.java
index fdb15ec..951d4f6 100644 (file)
--- a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPUpdateRowPage.java
+++ b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPUpdateRowPage.java
@@ -2,11 +2,6 @@ package net.sourceforge.phpdt.sql.wizards;
 
 import java.text.MessageFormat;
 
-import net.sourceforge.phpdt.sql.PHPEclipseSQLPlugin;
-import net.sourceforge.phpdt.sql.sql.TableRow;
-import net.sourceforge.phpdt.sql.view.PHPSourceConsole;
-import net.sourceforge.phpdt.sql.view.tableview.TableAdapter;
-
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
@@ -21,6 +16,11 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import net.sourceforge.phpdt.sql.PHPEclipseSQLPlugin;
+import net.sourceforge.phpdt.sql.sql.TableRow;
+import net.sourceforge.phpdt.sql.view.PHPSourceConsole;
+import net.sourceforge.phpdt.sql.view.tableview.TableAdapter;
+
 public class PHPUpdateRowPage extends WizardPage implements SQLPage {
   TableRow row;
   String[] columnNames;
@@ -30,7 +30,7 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
   Button[] setValues;
   Label query;
   IPreferenceStore fStore;
-  
+
   public PHPUpdateRowPage(String pageName) {
     super(pageName);
   }
@@ -64,12 +64,14 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
 
     columnNames = row.getColumnNames();
     String[] data = row.getTableData();
+
     if (DEBUG) {
       for (int i = 0; i < row.getColumnCount(); i++) {
         System.out.println("data = " + i + "=" + data[i]);
         System.out.println("column = " + i + "=" + columnNames[i]);
       }
     }
+
     oldValues = new Text[row.getColumnCount()];
     newValues = new Text[row.getColumnCount()];
     primaryKeys = new Button[row.getColumnCount()];
@@ -99,7 +101,7 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
         }
       });
       primaryKeys[i] = new Button(container, SWT.CHECK);
-   //   primaryKeys[i].setText("Where");
+      //   primaryKeys[i].setText("Where");
       primaryKeys[i].addSelectionListener(new SelectionListener() {
         public void widgetDefaultSelected(SelectionEvent e) {
         }
@@ -120,7 +122,7 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
         }
       });
       setValues[i] = new Button(container, SWT.CHECK);
-    //  setValues[i].setText("Set Value");
+      //  setValues[i].setText("Set Value");
       setValues[i].addSelectionListener(new SelectionListener() {
         public void widgetDefaultSelected(SelectionEvent e) {
         }
@@ -143,23 +145,25 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
 
     setPageComplete(true);
   }
+  
   public void updateQuery() {
     if (DEBUG) {
       System.out.println("Updating update query");
     }
+
     StringBuffer setClause = new StringBuffer();
     StringBuffer whereClause = new StringBuffer();
     for (int i = 0; i < columnNames.length; i++) {
       if (primaryKeys[i].getSelection()) {
         whereClause.append(columnNames[i]);
         whereClause.append(" = ");
-        whereClause.append("'"+oldValues[i].getText()+"'");
+        whereClause.append("'" + oldValues[i].getText() + "'");
         whereClause.append(", ");
       }
       if (setValues[i].getSelection()) {
         setClause.append(columnNames[i]);
         setClause.append(" = ");
-        setClause.append("'"+newValues[i].getText()+"'");
+        setClause.append("'" + newValues[i].getText() + "'");
         setClause.append(", ");
       }
     }
@@ -171,14 +175,14 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
       setClause.deleteCharAt(setClause.length() - 1);
       setClause.deleteCharAt(setClause.length() - 1);
     }
-    String[] arguments = { setClause.toString(), row.getTable(), whereClause.toString() };
+    String[] arguments = { row.getTable(), setClause.toString(), whereClause.toString()};
     MessageFormat form = new MessageFormat(fStore.getString("phpeclipse.sql.update.template"));
 
     String query = form.format(arguments);
-//
-//    String query = "$results = mysql_query(\"UPDATE " + row.getTable();
-//    query += " SET " + setClause.toString();
-//    query += " WHERE " + whereClause.toString() + "\");";
+    //
+    //    String query = "$results = mysql_query(\"UPDATE " + row.getTable();
+    //    query += " SET " + setClause.toString();
+    //    query += " WHERE " + whereClause.toString() + "\");";
     this.query.setText(query);
   }
   public boolean performFinish() {