Changeset 148

Timestamp:

05/30/08 16:48:59 (7 months ago)

Author:

zork

Message:

ported fixes to #26,#27 from trunk

Files:

• branches/debea_1_2/wxdba/wxdba/sqlistream.cpp (modified) (1 diff)
• branches/debea_1_2/wxdba/wxdba/sqlistream.h (modified) (1 diff)
• branches/debea_1_2/wxdba/wxdba/wxutils.cpp (modified) (1 diff)

branches/debea_1_2/wxdba/wxdba/sqlistream.cpp

@@ -66 +66 @@
-
-bool 
+SQLIStream::Get(dba::Storeable* pObject, const wxString& pRootTable) {
+  try {
+    return dba::SQLIStream::get(pObject, pRootTable.empty() ? (const char*)NULL : Tools::ConvertToDbStr(pRootTable, getConversionSpecs().mDbCharset).c_str());
+  } catch (const dba::Exception& pEx) {
+    Exception::Rethrow(pEx);
+  };
+};
+
+bool 
-SQLIStream::UpdateVars() {
-  try {

branches/debea_1_2/wxdba/wxdba/sqlistream.h

@@ -25 +25 @@
-    void OpenFromQuery(dba::Storeable& pClass,const wxString& pQuery, const wxString& pMainTable = wxEmptyString);
-    bool GetNext(dba::Storeable* pObject);
+    bool Get(dba::Storeable* pObject, const wxString& pRootTable = wxEmptyString);
-    bool UpdateVars();
-    DbResult* SendQuery(const wxString& pQuery) const;

branches/debea_1_2/wxdba/wxdba/wxutils.cpp

@@ -115 +115 @@
-Tools::SetDateTime(dba::Storeable* pObj,wxDateTime& pDest, const wxDateTime& pSrc) {
-  if (pDest.IsValid() && pSrc.IsValid()) {
-
+ {
-      pDest = pSrc;
-      pObj->setChanged();
+    }
-  } else if (!pDest.IsValid() && !pSrc.IsValid()) {
-    //no change