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

diff --git a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPSelectRowPage.java b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPSelectRowPage.java
index c15581a..4bfa368 100644
--- a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPSelectRowPage.java
+++ b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/PHPSelectRowPage.java
@@ -1,9 +1,13 @@
 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;
 import org.eclipse.swt.events.ModifyEvent;
@@ -20,11 +24,12 @@ import org.eclipse.swt.widgets.Text;
 public class PHPSelectRowPage extends WizardPage implements SQLPage {
   TableRow row;
   String[] columnNames;
-  Text[] oldValues;
+  Text[] whereValues;
   // Text[] newValues;
   Button[] primaryKeys;
   Button[] setValues;
   Label query;
+  IPreferenceStore fStore;
 
   public PHPSelectRowPage(String pageName) {
     super(pageName);
@@ -35,59 +40,69 @@ public class PHPSelectRowPage extends WizardPage implements SQLPage {
   }
 
   public void createControl(Composite parent) {
-    System.out.println("page create control");
+    if (DEBUG) {
+      System.out.println("page create control");
+    }
     Composite container = new Composite(parent, SWT.NULL);
+    fStore = PHPEclipseSQLPlugin.getDefault().getPreferenceStore();
+
     GridLayout layout = new GridLayout();
     container.setLayout(layout);
     int layoutColumns = 4;
     layout.numColumns = layoutColumns;
 
-    if (row == null) {
-      System.out.println("Row is null");
-    }
-    if (row.getColumnNames() == null) {
-      System.out.println("Columns are null");
-    }
-    if (row.getTableData() == null) {
-      System.out.println("Data is null");
+    if (DEBUG) {
+      if (row == null) {
+        System.out.println("Row is null");
+      }
+      if (row.getColumnNames() == null) {
+        System.out.println("Columns are null");
+      }
+      if (row.getTableData() == null) {
+        System.out.println("Data is null");
+      }
     }
     columnNames = row.getColumnNames();
     String[] data = row.getTableData();
-    for (int i = 0; i < row.getColumnCount(); i++) {
-      System.out.println("data = " + i + "=" + data[i]);
-      System.out.println("column = " + i + "=" + columnNames[i]);
+    
+    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()];
+    
+    whereValues = new Text[row.getColumnCount()];
     //  newValues = new Text[row.getColumnCount()];
     primaryKeys = new Button[row.getColumnCount()];
     setValues = new Button[row.getColumnCount()];
     Label temp = new Label(container, SWT.NULL);
     temp.setText("Column Name");
     temp = new Label(container, SWT.NULL);
-    temp.setText("Old Value");
+    temp.setText("Value");
     temp = new Label(container, SWT.NULL);
-    temp.setText("");
+    temp.setText("Where");
     //    temp = new Label(container, SWT.NULL);
     //    temp.setText("New Value");
     temp = new Label(container, SWT.NULL);
-    temp.setText("");
+    temp.setText("Select");
     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);
+      whereValues[i] = new Text(container, SWT.BORDER | SWT.SINGLE);
       if (data[i] == null || data[i].equals("")) {
-        oldValues[i].setText('$' + columnNames[i]);
+        whereValues[i].setText('$' + columnNames[i]);
       } else {
-        oldValues[i].setText(data[i]);
+        whereValues[i].setText(data[i]);
       }
-      oldValues[i].addModifyListener(new ModifyListener() {
+      whereValues[i].addModifyListener(new ModifyListener() {
         public void modifyText(ModifyEvent e) {
           updateQuery();
         }
       });
 
       primaryKeys[i] = new Button(container, SWT.CHECK);
-      primaryKeys[i].setText("Where Clause");
+      //primaryKeys[i].setText("Where Clause");
       primaryKeys[i].addSelectionListener(new SelectionListener() {
         public void widgetDefaultSelected(SelectionEvent e) {
         }
@@ -103,7 +118,7 @@ public class PHPSelectRowPage extends WizardPage implements SQLPage {
       //    }
       //  });
       setValues[i] = new Button(container, SWT.CHECK);
-      setValues[i].setText("Select Value");
+      //setValues[i].setText("Select Value");
       setValues[i].addSelectionListener(new SelectionListener() {
         public void widgetDefaultSelected(SelectionEvent e) {
         }
@@ -128,7 +143,9 @@ public class PHPSelectRowPage extends WizardPage implements SQLPage {
   }
 
   public void updateQuery() {
-    System.out.println("PHP SELECT");
+    if (DEBUG) {
+      System.out.println("PHP SELECT");
+    }
     StringBuffer setClause = new StringBuffer();
     StringBuffer whereClause = new StringBuffer();
     String temp;
@@ -141,13 +158,12 @@ public class PHPSelectRowPage extends WizardPage implements SQLPage {
         firstClause = true;
         whereClause.append(columnNames[i]);
         whereClause.append(" = ");
-        temp = oldValues[i].getText();
-//        if (temp.charAt(0) == '$') {
-//          whereClause.append(temp);
-//        } else {
-        whereClause.append("'"+temp+"'");
-//        }
-
+        temp = whereValues[i].getText();
+        //        if (temp.charAt(0) == '$') {
+        //          whereClause.append(temp);
+        //        } else {
+        whereClause.append("'" + temp + "'");
+        //        }
 
       }
       if (setValues[i].getSelection()) {
@@ -165,9 +181,14 @@ public class PHPSelectRowPage extends WizardPage implements SQLPage {
       setClause.deleteCharAt(setClause.length() - 1);
       setClause.deleteCharAt(setClause.length() - 1);
     }
-    String query = "$results = mysql_query(\"SELECT " + setClause.toString();
-    query += " FROM " + row.getTable();
-    query += " WHERE " + whereClause.toString() + "\");";
+    
+    String[] arguments = { setClause.toString(), row.getTable(), whereClause.toString() };
+    MessageFormat form = new MessageFormat(fStore.getString("phpeclipse.sql.select.template"));
+
+    String query = form.format(arguments);
+//    String query = "$results = mysql_query(\"SELECT " + setClause.toString();
+//    query += " FROM " + row.getTable();
+//    query += " WHERE " + whereClause.toString() + "\");";
     this.query.setText(query);
   }