X-Git-Url: http://secure.phpeclipse.com

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 0c6690f..951d4f6 100644
--- 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
@@ -1,5 +1,8 @@
 package net.sourceforge.phpdt.sql.wizards;
 
+import java.text.MessageFormat;
+
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
@@ -13,8 +16,9 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-import net.sourceforge.phpdt.sql.sql.MultiSQLServer;
+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 {
@@ -25,6 +29,8 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
   Button[] primaryKeys;
   Button[] setValues;
   Label query;
+  IPreferenceStore fStore;
+
   public PHPUpdateRowPage(String pageName) {
     super(pageName);
   }
@@ -37,6 +43,7 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
     if (DEBUG) {
       System.out.println("page create control");
     }
+    fStore = PHPEclipseSQLPlugin.getDefault().getPreferenceStore();
     Composite container = new Composite(parent, SWT.NULL);
     GridLayout layout = new GridLayout();
     container.setLayout(layout);
@@ -57,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()];
@@ -70,25 +79,29 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
     Label temp = new Label(container, SWT.NULL);
     temp.setText("Column Name");
     temp = new Label(container, SWT.NULL);
-    temp.setText("Old Value");
+    temp.setText("Where Value");
     temp = new Label(container, SWT.NULL);
-    temp.setText("");
+    temp.setText("Where");
     temp = new Label(container, SWT.NULL);
-    temp.setText("New Value");
+    temp.setText("Set Value");
     temp = new Label(container, SWT.NULL);
-    temp.setText("");
+    temp.setText("Set");
     for (int i = 0; i < row.getColumnCount(); i++) {
       Label label = new Label(container, SWT.NULL);
       label.setText(columnNames[i]);
       oldValues[i] = new Text(container, SWT.BORDER | SWT.SINGLE);
-      oldValues[i].setText(data[i]);
+      if (data[i] == null || data[i].equals("")) {
+        oldValues[i].setText('$' + columnNames[i]);
+      } else {
+        oldValues[i].setText(data[i]);
+      }
       oldValues[i].addModifyListener(new ModifyListener() {
         public void modifyText(ModifyEvent e) {
           updateQuery();
         }
       });
       primaryKeys[i] = new Button(container, SWT.CHECK);
-      primaryKeys[i].setText("Primary Key");
+      //   primaryKeys[i].setText("Where");
       primaryKeys[i].addSelectionListener(new SelectionListener() {
         public void widgetDefaultSelected(SelectionEvent e) {
         }
@@ -97,14 +110,19 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
         }
       });
       newValues[i] = new Text(container, SWT.BORDER | SWT.SINGLE);
-      newValues[i].setText(data[i]);
+
+      if (data[i] == null || data[i].equals("")) {
+        newValues[i].setText('$' + columnNames[i]);
+      } else {
+        newValues[i].setText(data[i]);
+      }
       newValues[i].addModifyListener(new ModifyListener() {
         public void modifyText(ModifyEvent e) {
           updateQuery();
         }
       });
       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) {
         }
@@ -127,23 +145,25 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
 
     setPageComplete(true);
   }
+  
   public void updateQuery() {
     if (DEBUG) {
-      System.out.println("Updating query");
+      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(", ");
       }
     }
@@ -155,14 +175,20 @@ public class PHPUpdateRowPage extends WizardPage implements SQLPage {
       setClause.deleteCharAt(setClause.length() - 1);
       setClause.deleteCharAt(setClause.length() - 1);
     }
-    String query = "UPDATE " + row.getTable();
-    query += " SET " + setClause.toString();
-    query += " WHERE " + 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() + "\");";
     this.query.setText(query);
   }
   public boolean performFinish() {
-    MultiSQLServer server = MultiSQLServer.getInstance();
-    server.execute(query.getText());
+    PHPSourceConsole console = PHPSourceConsole.getInstance();
+    console.clear();
+    console.print(query.getText());
     return true;
   }
 }
\ No newline at end of file