Author: mysqlpp
Date: Sun Aug 30 08:23:40 2009
New Revision: 2574
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2574&view=rev
Log:
- Added a warning to ssqls.h saying that it's deprecated, and will
be removed in v4.
- Suppressing this warning in the current examples and test programs.
The latter will remain after v3.1 is released, since we still need to
test the mechanism, but we should convert all the examples before
release.
Modified:
trunk/Wishlist
trunk/examples/images.h
trunk/examples/stock.h
trunk/lib/ssqls.pl
trunk/test/null_comparison.cpp
trunk/test/qssqls.cpp
trunk/test/sqlstream.cpp
Modified: trunk/Wishlist
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/Wishlist?rev=2574&r1=2573&r2=2574&view=diff
==============================================================================
--- trunk/Wishlist (original)
+++ trunk/Wishlist Sun Aug 30 08:23:40 2009
@@ -40,8 +40,6 @@
o Document sql_*_null in userman
o SSQLS v2 (http://lists.mysql.com/plusplus/6929):
-
- - Add #warning SSQLS v1 is deprecated to ssqls.h
- SSQLSv2 DSL generator: walk data structure created by previous,
writing back out valid SSQLSv2.
@@ -192,6 +190,11 @@
because it removes all the dynamic typing advantages we got with
the change to field name indices in v3.0.
+ - Convert SSQLS v1 examples to v2
+
+ - Remove MYSQLPP_ALLOW_SSQLS_V1 warning suppressor from examples.
+ (Leave test programs alone until we drop v1 support.)
+
o Try to add Query::storein(container, ssqls), which generates
SELECT * from {ssqls.table()} and stores the result. May not be
possible due to existing overloads, but try. If it works, use
Modified: trunk/examples/images.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/examples/images.h?rev=2574&r1=2573&r2=2574&view=diff
==============================================================================
--- trunk/examples/images.h (original)
+++ trunk/examples/images.h Sun Aug 30 08:23:40 2009
@@ -24,6 +24,7 @@
***********************************************************************/
#include <mysql++.h>
+#define MYSQLPP_ALLOW_SSQLS_V1 // suppress deprecation warning
#include <ssqls.h>
sql_create_2(images,
Modified: trunk/examples/stock.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/examples/stock.h?rev=2574&r1=2573&r2=2574&view=diff
==============================================================================
--- trunk/examples/stock.h (original)
+++ trunk/examples/stock.h Sun Aug 30 08:23:40 2009
@@ -25,6 +25,7 @@
***********************************************************************/
#include <mysql++.h>
+#define MYSQLPP_ALLOW_SSQLS_V1 // suppress deprecation warning
#include <ssqls.h>
// The following is calling a very complex macro which will create
Modified: trunk/lib/ssqls.pl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/ssqls.pl?rev=2574&r1=2573&r2=2574&view=diff
==============================================================================
--- trunk/lib/ssqls.pl (original)
+++ trunk/lib/ssqls.pl Sun Aug 30 08:23:40 2009
@@ -66,6 +66,10 @@
# error Your compiler is not compatible with the SSQLS feature!
#endif
+#if !defined(MYSQLPP_ALLOW_SSQLS_V1)
+# warning SSQLS v1 is deprecated, and will probably be removed in MySQL++
v4.
+#endif
+
#include <string>
#include <math.h>
Modified: trunk/test/null_comparison.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/test/null_comparison.cpp?rev=2574&r1=2573&r2=2574&view=diff
==============================================================================
--- trunk/test/null_comparison.cpp (original)
+++ trunk/test/null_comparison.cpp Sun Aug 30 08:23:40 2009
@@ -2,7 +2,7 @@
test/null_comparison.cpp - Tests that Null<T> and null_type comparison
operators and SSQLS comparison functions work correctly.
- Copyright (c) 2008 by Educational Technology Resources, Inc.
+ Copyright (c) 2008-2009 by Educational Technology Resources, Inc.
Others may also hold copyrights on code in this file. See the
CREDITS.txt file in the top directory of the distribution for details.
@@ -25,6 +25,7 @@
***********************************************************************/
#include <mysql++.h>
+#define MYSQLPP_ALLOW_SSQLS_V1 // suppress deprecation warning
#include <ssqls.h>
#include <iostream>
Modified: trunk/test/qssqls.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/test/qssqls.cpp?rev=2574&r1=2573&r2=2574&view=diff
==============================================================================
--- trunk/test/qssqls.cpp (original)
+++ trunk/test/qssqls.cpp Sun Aug 30 08:23:40 2009
@@ -24,6 +24,7 @@
***********************************************************************/
#include <mysql++.h>
+#define MYSQLPP_ALLOW_SSQLS_V1 // suppress deprecation warning
#include <ssqls.h>
#include <iostream>
Modified: trunk/test/sqlstream.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/test/sqlstream.cpp?rev=2574&r1=2573&r2=2574&view=diff
==============================================================================
--- trunk/test/sqlstream.cpp (original)
+++ trunk/test/sqlstream.cpp Sun Aug 30 08:23:40 2009
@@ -25,6 +25,7 @@
***********************************************************************/
#include <mysql++.h>
+#define MYSQLPP_ALLOW_SSQLS_V1 // suppress deprecation warning
#include <ssqls.h>
#include <sqlstream.h>
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
