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

diff --git a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/InsertRowPage.java b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/InsertRowPage.java
index 7098f46..5f8f6c2 100644
--- a/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/InsertRowPage.java
+++ b/archive/net.sourceforge.phpeclipse.sql/src/net/sourceforge/phpdt/sql/wizards/InsertRowPage.java
@@ -10,8 +10,15 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
+import net.sourceforge.phpdt.sql.Messages;
+import net.sourceforge.phpdt.sql.adapters.AdapterFactory;
+import net.sourceforge.phpdt.sql.adapters.DatabaseAdapter;
 import net.sourceforge.phpdt.sql.sql.MultiSQLServer;
 import net.sourceforge.phpdt.sql.sql.TableRow;
+import net.sourceforge.phpdt.sql.sql.metadata.ObjectMetaData;
+import net.sourceforge.phpdt.sql.view.BookmarkView;
+import net.sourceforge.phpdt.sql.view.bookmark.BookmarkNode;
+import net.sourceforge.phpdt.sql.view.bookmark.TreeNode;
 import net.sourceforge.phpdt.sql.view.tableview.TableAdapter;
 
 public class InsertRowPage extends WizardPage implements SQLPage {
@@ -29,38 +36,39 @@ public class InsertRowPage extends WizardPage implements SQLPage {
 
   public void createControl(Composite parent) {
     if (DEBUG) {
-      System.out.println("page create control");
+      System.out.println("page create control"); //$NON-NLS-1$
     }
+
     Composite container = new Composite(parent, SWT.NULL);
     GridLayout layout = new GridLayout();
     container.setLayout(layout);
-    int layoutColumns = 2;
-    layout.numColumns = layoutColumns;
+    layout.numColumns = 2;
 
     if (DEBUG) {
       if (row == null) {
-        System.out.println("Row is null");
+        System.out.println("Row is null"); //$NON-NLS-1$
       }
       if (row.getColumnNames() == null) {
-        System.out.println("Columns are null");
+        System.out.println("Columns are null"); //$NON-NLS-1$
       }
       if (row.getTableData() == null) {
-        System.out.println("Data is null");
+        System.out.println("Data is null"); //$NON-NLS-1$
       }
     }
+
     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]);
+        System.out.println("data = " + i + "=" + data[i]); //$NON-NLS-1$ //$NON-NLS-2$
+        System.out.println("column = " + i + "=" + columnNames[i]); //$NON-NLS-1$ //$NON-NLS-2$
       }
     }
+
     values = new Text[row.getColumnCount()];
-    Label temp = new Label(container, SWT.NULL);
-    temp.setText("Column Name");
-    temp = new Label(container, SWT.NULL);
-    temp.setText("Value");
+    new Label(container, SWT.NULL).setText(Messages.getString("InsertRowPage.ColumnName")); //$NON-NLS-1$
+    new Label(container, SWT.NULL).setText(Messages.getString("InsertRowPage.Value")); //$NON-NLS-1$
     for (int i = 0; i < row.getColumnCount(); i++) {
       Label label = new Label(container, SWT.NULL);
       label.setText(columnNames[i]);
@@ -78,7 +86,7 @@ public class InsertRowPage extends WizardPage implements SQLPage {
     }
     query = new Label(container, SWT.WRAP);
     GridData gridData = new GridData();
-    gridData.horizontalSpan = layoutColumns;
+    gridData.horizontalSpan = layout.numColumns;
     gridData.horizontalAlignment = GridData.FILL;
     gridData.verticalAlignment = GridData.FILL;
     gridData.grabExcessHorizontalSpace = true;
@@ -92,25 +100,38 @@ public class InsertRowPage extends WizardPage implements SQLPage {
   }
   public void updateQuery() {
     if (DEBUG) {
-      System.out.println("Updating query");
+      System.out.println("Updating query"); //$NON-NLS-1$
     }
+
     StringBuffer valuesClause = new StringBuffer();
+    BookmarkNode bookmark = row.getBookmarkNode();
+    TreeNode node = bookmark.find(row.getTable());
+    ObjectMetaData metadata = null;
+    if (node != null)
+      metadata = node.getMetaData();
+    DatabaseAdapter adapter = AdapterFactory.getInstance().getAdapter(bookmark.getType());
+
+    int numValues = 0;
     for (int i = 0; i < columnNames.length; i++) {
-      valuesClause.append(values[i].getText());
-      valuesClause.append(", ");
-    }
-    if (valuesClause.length() > 1) {
-      valuesClause.deleteCharAt(valuesClause.length() - 1);
-      valuesClause.deleteCharAt(valuesClause.length() - 1);
+      String value = values[i].getText();
+      if (numValues > 0)
+        valuesClause.append(", "); //$NON-NLS-1$
+      if (adapter != null && metadata != null && value != "") //$NON-NLS-1$
+        valuesClause.append(adapter.quote(value, metadata.getColumnType(columnNames[i])));
+      else
+        valuesClause.append(value);
+      numValues++;
     }
-    String query = "INSERT INTO " + row.getTable();
-    query += " VALUES (" + valuesClause.toString();
-    query += " )";
+    String query = "INSERT INTO " + row.getTable(); //$NON-NLS-1$
+    query += " VALUES (" + valuesClause; //$NON-NLS-1$
+    query += " )"; //$NON-NLS-1$
     this.query.setText(query);
   }
   public boolean performFinish() {
     MultiSQLServer server = MultiSQLServer.getInstance();
-    server.execute(query.getText());
+    BookmarkView bookmarkView = BookmarkView.getInstance();
+    BookmarkNode bookmark = bookmarkView.getCurrentBookmark();
+    server.execute(bookmark.getConnection(), query.getText());
     return true;
   }
 }
\ No newline at end of file