--- pgadmin2/pgadmin2/frmSQLOutput.frm.orig	Thu Sep 25 01:58:04 2003
+++ pgadmin2/pgadmin2/frmSQLOutput.frm	Thu Sep 25 02:11:27 2003
@@ -228,14 +228,14 @@
         If lvData.SelectedItem.Text <> "" Then
           Select Case Val(Mid(lvData.ColumnHeaders(X + 1).Key, InStr(1, lvData.ColumnHeaders(X + 1).Key, ":") + 1))
             Case adDate
-              szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & Format(lvData.SelectedItem.Text, "yyyy-MM-dd") & "' AND "
+              szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & Format(lvData.SelectedItem.Text, "yyyy-MM-dd") & "' AND "
             Case adDBDate
-              szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & Format(lvData.SelectedItem.Text, "yyyy-MM-dd") & "' AND "
+              szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & Format(lvData.SelectedItem.Text, "yyyy-MM-dd") & "' AND "
             Case adDBTimeStamp
-              szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & Format(lvData.SelectedItem.Text, "yyyy-MM-dd hh:mm:ss") & "' AND "
+              szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & Format(lvData.SelectedItem.Text, "yyyy-MM-dd hh:mm:ss") & "' AND "
             Case Else
               If ((InStr(1, lvData.SelectedItem.Text, vbCrLf) <> 0) + (InStr(1, lvData.SelectedItem.Text, "\n")) <> 0) = 0 Then
-                szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & dbSZ(lvData.SelectedItem.Text) & "' AND "
+                szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.Text) & "' AND "
               End If
           End Select
         End If
@@ -243,14 +243,14 @@
         If lvData.SelectedItem.SubItems(X) <> "" Then
           Select Case Val(Mid(lvData.ColumnHeaders(X + 1).Key, InStr(1, lvData.ColumnHeaders(X + 1).Key, ":") + 1))
             Case adDate
-              szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & Format(lvData.SelectedItem.SubItems(X), "yyyy-MM-dd") & "' AND "
+              szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & Format(lvData.SelectedItem.SubItems(X), "yyyy-MM-dd") & "' AND "
             Case adDBDate
-              szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & Format(lvData.SelectedItem.SubItems(X), "yyyy-MM-dd") & "' AND "
+              szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & Format(lvData.SelectedItem.SubItems(X), "yyyy-MM-dd") & "' AND "
             Case adDBTimeStamp
-              szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & Format(lvData.SelectedItem.SubItems(X), "yyyy-MM-dd hh:mm:ss") & "' AND "
+              szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & Format(lvData.SelectedItem.SubItems(X), "yyyy-MM-dd hh:mm:ss") & "' AND "
             Case Else
               If ((InStr(1, lvData.SelectedItem.Text, vbCrLf) <> 0) + (InStr(1, lvData.SelectedItem.Text, "\n")) <> 0) = 0 Then
-                szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & dbSZ(lvData.SelectedItem.SubItems(X)) & "' AND "
+                szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.SubItems(X)) & "' AND "
               End If
           End Select
         End If
@@ -273,9 +273,9 @@
     If bBuiltEditBox Then
       If txtField(iUnique - 1).Tag <> "Y" Then
         If iUnique = 1 Then
-          szFullCriteria = " WHERE " & fmtID(lvData.ColumnHeaders(iUnique).Text) & " = '" & dbSZ(lvData.SelectedItem.Text) & "'"
+          szFullCriteria = " WHERE " & QUOTE & fmtID(lvData.ColumnHeaders(iUnique).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.Text) & "'"
         Else
-          szFullCriteria = " WHERE " & fmtID(lvData.ColumnHeaders(iUnique).Text) & " = '" & dbSZ(lvData.SelectedItem.SubItems(iUnique - 1)) & "'"
+          szFullCriteria = " WHERE " & QUOTE & fmtID(lvData.ColumnHeaders(iUnique).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.SubItems(iUnique - 1)) & "'"
         End If
       Else
         If (szCriteria <> "") Or (szWhere <> "") Then
@@ -286,9 +286,9 @@
       End If
     Else
       If iUnique = 1 Then
-        szFullCriteria = " WHERE " & fmtID(lvData.ColumnHeaders(iUnique).Text) & " = '" & dbSZ(lvData.SelectedItem.Text) & "'"
+        szFullCriteria = " WHERE " & QUOTE & fmtID(lvData.ColumnHeaders(iUnique).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.Text) & "'"
       Else
-        szFullCriteria = " WHERE " & fmtID(lvData.ColumnHeaders(iUnique).Text) & " = '" & dbSZ(lvData.SelectedItem.SubItems(iUnique - 1)) & "'"
+        szFullCriteria = " WHERE " & QUOTE & fmtID(lvData.ColumnHeaders(iUnique).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.SubItems(iUnique - 1)) & "'"
       End If
     End If
   Else
@@ -450,24 +450,24 @@
         Select Case Val(Mid(lvData.ColumnHeaders(X + 1).Key, InStr(1, lvData.ColumnHeaders(X + 1).Key, ":") + 1))
           Case adDate
             If txtField(X).Text = "" Then
-              szValues = szValues & fmtID(lblField(X).Caption) & " = NULL, "
+              szValues = szValues & QUOTE & fmtID(lblField(X).Caption) & QUOTE & " = NULL, "
             Else
-              szValues = szValues & fmtID(lblField(X).Caption) & " = '" & MakeISODate(txtField(X).Text) & "', "
+              szValues = szValues & QUOTE & fmtID(lblField(X).Caption) & QUOTE & " = '" & MakeISODate(txtField(X).Text) & "', "
             End If
           Case adDBDate
             If txtField(X).Text = "" Then
-              szValues = szValues & fmtID(lblField(X).Caption) & " = NULL, "
+              szValues = szValues & QUOTE & fmtID(lblField(X).Caption) & QUOTE & " = NULL, "
             Else
-              szValues = szValues & fmtID(lblField(X).Caption) & " = '" & MakeISODate(txtField(X).Text) & "', "
+              szValues = szValues & QUOTE & fmtID(lblField(X).Caption) & QUOTE & " = '" & MakeISODate(txtField(X).Text) & "', "
             End If
           Case adDBTimeStamp
             If txtField(X).Text = "" Then
-              szValues = szValues & fmtID(lblField(X).Caption) & " = NULL, "
+              szValues = szValues & QUOTE & fmtID(lblField(X).Caption) & QUOTE & " = NULL, "
             Else
-              szValues = szValues & fmtID(lblField(X).Caption) & " = '" & MakeISOTimestamp(txtField(X).Text) & "', "
+              szValues = szValues & QUOTE & fmtID(lblField(X).Caption) & QUOTE & " = '" & MakeISOTimestamp(txtField(X).Text) & "', "
             End If
           Case Else
-            szValues = szValues & fmtID(lblField(X).Caption) & " = '" & dbSZ(txtField(X).Text) & "', "
+            szValues = szValues & QUOTE & fmtID(lblField(X).Caption) & QUOTE & " = '" & dbSZ(txtField(X).Text) & "', "
         End Select
       End If
     Next X
@@ -482,14 +482,14 @@
             If lvData.SelectedItem.Text <> "" Then
               Select Case Val(Mid(lvData.ColumnHeaders(X + 1).Key, InStr(1, lvData.ColumnHeaders(X + 1).Key, ":") + 1))
                 Case adDate
-                  szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISODate(lvData.SelectedItem.Text) & "' AND "
+                  szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISODate(lvData.SelectedItem.Text) & "' AND "
                 Case adDBDate
-                  szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISODate(lvData.SelectedItem.Text) & "' AND "
+                  szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISODate(lvData.SelectedItem.Text) & "' AND "
                 Case adDBTimeStamp
-                  szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISOTimestamp(lvData.SelectedItem.Text) & "' AND "
+                  szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISOTimestamp(lvData.SelectedItem.Text) & "' AND "
                 Case Else
                   If ((InStr(1, lvData.SelectedItem.Text, vbCrLf) <> 0) + (InStr(1, lvData.SelectedItem.Text, "\n")) <> 0) = 0 Then
-                    szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & dbSZ(lvData.SelectedItem.Text) & "' AND "
+                    szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.Text) & "' AND "
                   End If
               End Select
             End If
@@ -497,14 +497,14 @@
             If lvData.SelectedItem.SubItems(X) <> "" Then
               Select Case Val(Mid(lvData.ColumnHeaders(X + 1).Key, InStr(1, lvData.ColumnHeaders(X + 1).Key, ":") + 1))
                 Case adDate
-                  szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISODate(lvData.SelectedItem.SubItems(X)) & "' AND "
+                  szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISODate(lvData.SelectedItem.SubItems(X)) & "' AND "
                 Case adDBDate
-                  szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISODate(lvData.SelectedItem.SubItems(X)) & "' AND "
+                  szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISODate(lvData.SelectedItem.SubItems(X)) & "' AND "
                 Case adDBTimeStamp
-                  szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISOTimestamp(lvData.SelectedItem.SubItems(X)) & "' AND "
+                  szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISOTimestamp(lvData.SelectedItem.SubItems(X)) & "' AND "
                 Case Else
                   If ((InStr(1, lvData.SelectedItem.SubItems(X), vbCrLf) <> 0) + (InStr(1, lvData.SelectedItem.SubItems(X), "\n")) <> 0) = 0 Then
-                    szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & dbSZ(lvData.SelectedItem.SubItems(X)) & "' AND "
+                    szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.SubItems(X)) & "' AND "
                   End If
               End Select
             End If
@@ -517,14 +517,14 @@
           If lvData.SelectedItem.Text <> "" Then
             Select Case Val(Mid(lvData.ColumnHeaders(X + 1).Key, InStr(1, lvData.ColumnHeaders(X + 1).Key, ":") + 1))
               Case adDate
-                szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISODate(lvData.SelectedItem.Text) & "' AND "
+                szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISODate(lvData.SelectedItem.Text) & "' AND "
               Case adDBDate
-                szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISODate(lvData.SelectedItem.Text) & "' AND "
+                szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISODate(lvData.SelectedItem.Text) & "' AND "
               Case adDBTimeStamp
-                szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISOTimestamp(lvData.SelectedItem.Text) & "' AND "
+                szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISOTimestamp(lvData.SelectedItem.Text) & "' AND "
               Case Else
                 If ((InStr(1, lvData.SelectedItem.Text, vbCrLf) <> 0) + (InStr(1, lvData.SelectedItem.Text, "\n")) <> 0) = 0 Then
-                  szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & dbSZ(lvData.SelectedItem.Text) & "' AND "
+                  szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.Text) & "' AND "
                 End If
             End Select
           End If
@@ -532,14 +532,14 @@
           If lvData.SelectedItem.SubItems(X) <> "" Then
             Select Case Val(Mid(lvData.ColumnHeaders(X + 1).Key, InStr(1, lvData.ColumnHeaders(X + 1).Key, ":") + 1))
               Case adDate
-                szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISODate(lvData.SelectedItem.SubItems(X)) & "' AND "
+                szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISODate(lvData.SelectedItem.SubItems(X)) & "' AND "
               Case adDBDate
-                szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISODate(lvData.SelectedItem.SubItems(X)) & "' AND "
+                szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISODate(lvData.SelectedItem.SubItems(X)) & "' AND "
               Case adDBTimeStamp
-                szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & MakeISOTimestamp(lvData.SelectedItem.SubItems(X)) & "' AND "
+                szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & MakeISOTimestamp(lvData.SelectedItem.SubItems(X)) & "' AND "
               Case Else
                 If ((InStr(1, lvData.SelectedItem.SubItems(X), vbCrLf) <> 0) + (InStr(1, lvData.SelectedItem.SubItems(X), "\n")) <> 0) = 0 Then
-                  szCriteria = szCriteria & fmtID(lvData.ColumnHeaders(X + 1).Text) & " = '" & dbSZ(lvData.SelectedItem.SubItems(X)) & "' AND "
+                  szCriteria = szCriteria & QUOTE & fmtID(lvData.ColumnHeaders(X + 1).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.SubItems(X)) & "' AND "
                 End If
             End Select
           End If
@@ -569,9 +569,9 @@
     If iUnique > 0 Then
       If txtField(iUnique - 1).Tag <> "Y" Then
         If iUnique = 1 Then
-          szFullCriteria = " WHERE " & fmtID(lvData.ColumnHeaders(iUnique).Text) & " = '" & dbSZ(lvData.SelectedItem.Text) & "'"
+          szFullCriteria = " WHERE " & QUOTE & fmtID(lvData.ColumnHeaders(iUnique).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.Text) & "'"
         Else
-          szFullCriteria = " WHERE " & fmtID(lvData.ColumnHeaders(iUnique).Text) & " = '" & dbSZ(lvData.SelectedItem.SubItems(iUnique - 1)) & "'"
+          szFullCriteria = " WHERE " & QUOTE & fmtID(lvData.ColumnHeaders(iUnique).Text) & QUOTE & " = '" & dbSZ(lvData.SelectedItem.SubItems(iUnique - 1)) & "'"
         End If
       Else
         If (szCriteria <> "") Or (szWhere <> "") Then