1. 添加查询数据库所有内容的测试例。 2. 不使用视图获取最后一个门店信息。

fmvip/db/database.h

@@ -162,24 +162,17 @@ inline std::shared_ptr<odb::database> DBSP() {
 
 inline QSharedPointer<StoreInfo> GetLastStoreInfo()
 {
-    QSharedPointer<StoreInfo> storeInfoP(new StoreInfo());
+    QSharedPointer<StoreInfo> storeInfoP;
     try {
         odb::transaction t (DBSP()->begin ());
 
-        odb::result<StoreInfo_last> sl(DBSP()->query<StoreInfo_last>());
+        odb::result<StoreInfo> sl(DBSP()->query<StoreInfo>("order by id desc limit 0,1"));
         if(!sl.empty()) {
-            storeInfoP->setId(sl.begin()->_id);
-            storeInfoP->setStoreId(sl.begin()->_storeId);
-            storeInfoP->setPosId(sl.begin()->_posId);
-            storeInfoP->setBusinessDate(sl.begin()->_businessDate);
-            storeInfoP->setOperatorId(sl.begin()->_operatorId);
-        } else {
-            storeInfoP.clear();
+            storeInfoP = sl.begin().load();
         }
 
         t.commit ();
     } catch (const odb::exception &e) {
-        storeInfoP.clear();
         qDebug() << "Exception: Get last store info: " << e.what();
     }
     return storeInfoP;

fmvip/db/item.h

@@ -221,21 +221,21 @@ private:
     QString _businessDate;
 };
 
-#pragma db view object(StoreInfo)   \
-    query((?) + "order by id desc limit 0,1")
-struct StoreInfo_last
-{
-#pragma db column(StoreInfo::_id)
-    unsigned long _id;
-#pragma db column(StoreInfo::_storeId)
-    QString _storeId;
-#pragma db column(StoreInfo::_posId)
-    QString _posId;
-#pragma db column(StoreInfo::_operatorId)
-    QString _operatorId;
-#pragma db column(StoreInfo::_businessDate)
-    QString _businessDate;
-};
+//#pragma db view object(StoreInfo)   \
+//    query((?) + "order by id desc limit 0,1")
+//struct StoreInfo_last
+//{
+//#pragma db column(StoreInfo::_id)
+//    unsigned long _id;
+//#pragma db column(StoreInfo::_storeId)
+//    QString _storeId;
+//#pragma db column(StoreInfo::_posId)
+//    QString _posId;
+//#pragma db column(StoreInfo::_operatorId)
+//    QString _operatorId;
+//#pragma db column(StoreInfo::_businessDate)
+//    QString _businessDate;
+//};
 
 }
 

tests/autotest/tst_db_query.h

@@ -43,6 +43,29 @@ TEST_F(TestDBQuery, Load)
     }
 }
 
+TEST_F(TestDBQuery, QueryAll)
+{
+    try {
+        transaction t(DBSP()->begin());
+
+        result<Order> r(DBSP()->query<Order>());
+
+        ASSERT_FALSE(r.empty());
+
+        QSharedPointer<Order> firstOrder = r.begin().load();
+        EXPECT_EQ(firstOrder->id(), 1);
+
+        for(result<Order>::iterator it(r.begin()); it!=r.end(); ++it) {
+            EXPECT_NE(it->orderId(), "");
+        }
+
+        t.commit();
+
+    } catch (const odb::exception& e) {
+        FAIL() << "Exception: " << e.what() << std::endl;
+    }
+}
+
 TEST_F(TestDBQuery, Query)
 {
     try {

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 50
+#define VER_BUILD 51
 
 //! Convert version numbers to string
 #define _STR(S)  #S