MySQL++

Check-in [57170bf853]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Squished a few complaints from Doxygen. NFC.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256:57170bf85388ae5a91461f6f32cb365210aac05a1597794c3270e91d724128d5
User & Date: tangent 2018-07-27 03:59:04
Context
2018-07-27
04:34
Updated user manual Docbook version from 4.2 to 4.4, effectively dropping CentOS 3 and 4 as build platforms, since the current Homebrew Docbook XSL stylesheets throw lots of errors if you specify 4.2 or 4.3. Updated the user manual's README.txt file accordingly. check-in: 3b3678d64e user: tangent tags: trunk
03:59
Squished a few complaints from Doxygen. NFC. check-in: 57170bf853 user: tangent tags: trunk
03:57
Updated Doxygen-related files for Doxygen 1.8.14. check-in: 8bfb213043 user: tangent tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to lib/common.h.

217
218
219
220
221
222
223






224



225
226





227



228
229
230
231
#	include <mysql/mysql.h>
#else
#	include <mysql.h>
#endif

// The Unicode chapter of the user manual justifies the following.
#if MYSQL_VERSION_ID >= 50500






#   define MYSQLPP_UTF8_CS "utf8mb4"



#   define MYSQLPP_UTF8_COL "utf8mb4_general_ci"
#else





#   define MYSQLPP_UTF8_CS "utf8"



#   define MYSQLPP_UTF8_COL "utf8_general_ci"
#endif

#endif // !defined(MYSQLPP_COMMON_H)







>
>
>
>
>
>
|
>
>
>


>
>
>
>
>
|
>
>
>




217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
#	include <mysql/mysql.h>
#else
#	include <mysql.h>
#endif

// The Unicode chapter of the user manual justifies the following.
#if MYSQL_VERSION_ID >= 50500
    /// \brief Use this macro in CREATE TABLE strings to get the best
    /// available UTF-8 character set.
    ///
    /// MySQL++ is built against MySQL or MariaDB 5.5 or newer, so these
    /// macros are defined so that programs using them get the complete
    /// UTF-8 character set.
#   define MYSQLPP_UTF8_CS  "utf8mb4"

    /// \brief Use this macro in CREATE TABLE strings to get a matching
    /// collation to the character set selected by MYSQLPP_UTF8_CS
#   define MYSQLPP_UTF8_COL "utf8mb4_general_ci"
#else
    /// \brief Use this macro in CREATE TABLE strings to get the best
    /// available UTF-8 character set and correpsonding collation.
    ///
    /// MySQL++ is built against a version of MySQL or MariaDB older than
    /// 5.5, so we must use the legacy 3-byte-limited subset of UTF-8.
#   define MYSQLPP_UTF8_CS  "utf8"

    /// \brief Use this macro in CREATE TABLE strings to get a matching
    /// collation to the character set selected by MYSQLPP_UTF8_CS
#   define MYSQLPP_UTF8_COL "utf8_general_ci"
#endif

#endif // !defined(MYSQLPP_COMMON_H)

Changes to lib/stadapter.h.

218
219
220
221
222
223
224


225



226
227
228
229
230
231
232
	/// initialized (default ctor called, and no subsequent assignment)
	/// or if there are not at least i + 1 characters in the buffer.
	///
	/// WARNING: The throw-spec is incorrect, but it's irrelevant since
    /// they're obsolete in modern C++ now anyway, since they were
    /// always unreliable.  If we ever get to MySQL++ 4 and can break
    /// the ABI, this throw-spec will just go away.


	char at(size_type i) const MAY_THROW(std::out_of_range);




	/// \brief Compare the internal buffer to the given string
	///
	/// Works just like string::compare(const std::string&).
	int compare(const SQLTypeAdapter& other) const;

	/// \brief Compare the internal buffer to the given string







>
>
|
>
>
>







218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
	/// initialized (default ctor called, and no subsequent assignment)
	/// or if there are not at least i + 1 characters in the buffer.
	///
	/// WARNING: The throw-spec is incorrect, but it's irrelevant since
    /// they're obsolete in modern C++ now anyway, since they were
    /// always unreliable.  If we ever get to MySQL++ 4 and can break
    /// the ABI, this throw-spec will just go away.
#if !defined(DOXYGEN_IGNORE) && __cplusplus >= 201703L
    // Can't use MAY_THROW() here: it confuses Doxygen 1.8.14.
	char at(size_type i) const noexcept(false);
#else
	char at(size_type i) const throw(std::out_of_range);
#endif

	/// \brief Compare the internal buffer to the given string
	///
	/// Works just like string::compare(const std::string&).
	int compare(const SQLTypeAdapter& other) const;

	/// \brief Compare the internal buffer to the given string