From b038ab0cd6335f3e4ec075d1e21f5d7bb89e3ffb Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 19 Jul 2011 13:42:18 +0200
Subject: New design for NULL semantics
Now, instead of being specified as part of the SQL type with the type
pragma, there are separate null and not_null pragmas. The not_null
pragma was used to control NULL-ness of object pointers. Now the two
pragmas are used consistently for object pointers and simple values
(and in the future will work for composite values and containers).
---
qt/common/smart-ptr/test.hxx | 2 +-
qt/mysql/date-time/test.hxx | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'qt')
diff --git a/qt/common/smart-ptr/test.hxx b/qt/common/smart-ptr/test.hxx
index 06c05fa..0a4ce03 100644
--- a/qt/common/smart-ptr/test.hxx
+++ b/qt/common/smart-ptr/test.hxx
@@ -30,7 +30,7 @@ struct cont
typedef std::vector<QLazyWeakPointer<obj> > obj_list;
- #pragma db inverse(c) not_null
+ #pragma db inverse(c) value_not_null
obj_list o;
};
diff --git a/qt/mysql/date-time/test.hxx b/qt/mysql/date-time/test.hxx
index b40f45f..dd0f640 100644
--- a/qt/mysql/date-time/test.hxx
+++ b/qt/mysql/date-time/test.hxx
@@ -42,11 +42,11 @@ struct object
QDate date;
QDateTime date_time;
- // Specify NULL explicitly to suppress auto-initialization and
- // auto-update characteristics of TIMESTAMP datatype, and to allow
- // NULL values.
+ // Make timestamp NULL-able to suppress the auto-initialization and
+ // auto-update characteristics of the TIMESTAMP datatype, and to
+ // allow NULL values.
//
- #pragma db type("TIMESTAMP NULL")
+ #pragma db type("TIMESTAMP") null
QDateTime timestamp;
QTime time;
--
cgit v1.1