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

diff --git a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPDeleteRowPage.java b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPDeleteRowPage.java
index 0815049..de7ec86 100644
--- a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPDeleteRowPage.java
+++ b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPDeleteRowPage.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 PHPDeleteRowPage extends WizardPage implements SQLPage {
@@ -23,6 +27,7 @@ public class PHPDeleteRowPage extends WizardPage implements SQLPage {
   Text[] values;
   Button[] whereValues;
   Label query;
+  IPreferenceStore fStore;
 
   public PHPDeleteRowPage(String pageName) {
     super(pageName);
@@ -33,9 +38,8 @@ public class PHPDeleteRowPage extends WizardPage implements SQLPage {
   }
 
   public void createControl(Composite parent) {
-    if (DEBUG) {
-      System.out.println("page create control");
-    }
+    System.out.println("page create control");
+    fStore = PHPEclipseSQLPlugin.getDefault().getPreferenceStore();
     Composite container = new Composite(parent, SWT.NULL);
     GridLayout layout = new GridLayout();
     container.setLayout(layout);
@@ -46,7 +50,6 @@ public class PHPDeleteRowPage extends WizardPage implements SQLPage {
       if (row == null) {
         System.out.println("Row is null");
       }
-
       if (row.getColumnNames() == null) {
         System.out.println("Columns are null");
       }
@@ -77,7 +80,12 @@ public class PHPDeleteRowPage extends WizardPage implements SQLPage {
       GridData fullHorizontal = new GridData();
       fullHorizontal.horizontalAlignment = GridData.FILL;
       values[i].setLayoutData(fullHorizontal);
-      values[i].setText(data[i]);
+
+      if (data[i] == null || data[i].equals("")) {
+        values[i].setText('$' + columnNames[i]);
+      } else {
+        values[i].setText(data[i]);
+      }
 
       values[i].addModifyListener(new ModifyListener() {
         public void modifyText(ModifyEvent e) {
@@ -111,38 +119,55 @@ public class PHPDeleteRowPage extends WizardPage implements SQLPage {
   }
   public void updateQuery() {
     if (DEBUG) {
-      System.out.println("Updating query");
+      System.out.println("Updating delete query");
     }
     StringBuffer whereClause = new StringBuffer();
     int numSelected = 0;
+    boolean first = false;
     for (int i = 0; i < columnNames.length; i++) {
       if (whereValues[i].getSelection()) {
         numSelected++;
+        if (first) {
+          whereClause.append(", ");
+        }
+
         whereClause.append(columnNames[i]);
         whereClause.append(" = ");
-        whereClause.append(values[i].getText());
-        whereClause.append(", ");
+        whereClause.append("'" + values[i].getText() + "'");
+
+        first = true;
       }
     }
-    if (whereClause.length() > 1) {
-      whereClause.deleteCharAt(whereClause.length() - 1);
-      whereClause.deleteCharAt(whereClause.length() - 1);
-    }
-    String query = "DELETE FROM " + row.getTable();
-    if (numSelected > 0) {
-      query += " WHERE " + whereClause.toString();
-    }
+    //    if (whereClause.length() > 1) {
+    //      whereClause.deleteCharAt(whereClause.length() - 1);
+    //      whereClause.deleteCharAt(whereClause.length() - 1);
+    //    }
+
+    String[] arguments = { row.getTable(), whereClause.toString()};
+    MessageFormat form = new MessageFormat(fStore.getString("phpeclipse.sql.delete.template"));
+
+    String query = form.format(arguments);
+
+    //	  String query = "$results = mysql_query(\"DELETE FROM " + row.getTable();
+    //	  if (numSelected > 0) {
+    //		query += " WHERE " + whereClause.toString() + "\");";
+    //	  } else {
+    //		query += "\");";
+    //	  }
+
     if (numSelected > 0) {
       setMessage("");
     } else {
       setMessage("Warning: no \"where clause\" columns selected, all rows will be deleted");
     }
+
     this.getControl().pack();
     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