Log Message:
-----------
change unsigned conversion for oids
Modified Files:
--------------
pgadmin3/src/ui:
frmEditGrid.cpp (r1.58 -> r1.59)
pgadmin3/src/include:
frmEditGrid.h (r1.17 -> r1.18)
Index: frmEditGrid.cpp
===================================================================
RCS file: /projects/pgadmin3/src/ui/frmEditGrid.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -Lsrc/ui/frmEditGrid.cpp -Lsrc/ui/frmEditGrid.cpp -u -w -r1.58 -r1.59
--- src/ui/frmEditGrid.cpp
+++ src/ui/frmEditGrid.cpp
@@ -1079,7 +1079,7 @@
-sqlTable::sqlTable(pgConn *conn, pgQueryThread *_thread, const wxString& tabName,
const Oid _relid, bool _hasOid, const wxString& _pkCols, char _relkind)
+sqlTable::sqlTable(pgConn *conn, pgQueryThread *_thread, const wxString& tabName,
const OID _relid, bool _hasOid, const wxString& _pkCols, char _relkind)
{
connection=conn;
primaryKeyColNumbers = _pkCols;
@@ -1116,7 +1116,7 @@
wxT(" JOIN pg_namespace n ON n.oid=relnamespace\n")
wxT(" LEFT OUTER JOIN pg_type b ON b.oid=t.typbasetype\n")
wxT(" LEFT OUTER JOIN pg_attrdef def ON adrelid=attrelid AND adnum=attnum\n")
- wxT(" WHERE attnum > 0 AND NOT attisdropped AND attrelid=") +
NumToStr((long)relid) + wxT("::oid\n")
+ wxT(" WHERE attnum > 0 AND NOT attisdropped AND attrelid=") + NumToStr(relid)
+ wxT("::oid\n")
wxT(" ORDER BY attnum"));
Index: frmEditGrid.h
===================================================================
RCS file: /projects/pgadmin3/src/include/frmEditGrid.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -Lsrc/include/frmEditGrid.h -Lsrc/include/frmEditGrid.h -u -w -r1.17 -r1.18
--- src/include/frmEditGrid.h
+++ src/include/frmEditGrid.h
@@ -57,7 +57,7 @@
wxGridCellAttr *attr;
wxString Quote(const wxString &value);
- Oid type;
+ OID type;
long typlen, typmod;
wxString name, typeName;
bool numeric, isPrimaryKey, needResize;
@@ -86,7 +86,7 @@
class sqlTable : public wxGridTableBase
{
public:
- sqlTable(pgConn *conn, pgQueryThread *thread, const wxString& tabName, const Oid
relid, bool _hasOid, const wxString& _pkCols, char _relkind);
+ sqlTable(pgConn *conn, pgQueryThread *thread, const wxString& tabName, const OID
relid, bool _hasOid, const wxString& _pkCols, char _relkind);
~sqlTable();
void StoreLine();
void UndoLine(int row);
@@ -122,7 +122,7 @@
bool hasOids;
char relkind;
wxString tableName;
- Oid relid;
+ OID relid;
wxString primaryKeyColNumbers;
cacheLine *GetLine(int row);
@@ -186,7 +186,7 @@
wxToolBar *toolBar;
char relkind;
- Oid relid;
+ OID relid;
bool hasOids;
bool optionsChanged;
wxString tableName;
---------------------------(end of broadcast)---------------------------
TIP 1: subscribe and unsubscribe commands go to [EMAIL PROTECTED]