update to 2.0.6
This commit is contained in:
wilfried
parent
641af1d260
commit
a9f7edffc9
@ -1,15 +1,17 @@
|
|||||||
# $OpenBSD: Makefile,v 1.18 2005/09/08 01:51:00 pvalchev Exp $
|
# $OpenBSD: Makefile,v 1.19 2005/10/07 13:21:27 wilfried Exp $
|
||||||
|
|
||||||
|
NOT_FOR_ARCHS= ${NO_SHARED_ARCHS}
|
||||||
|
|
||||||
COMMENT= "C++ API for MySQL"
|
COMMENT= "C++ API for MySQL"
|
||||||
COMMENT-docs= "C++ API for MySQL documentation"
|
COMMENT-docs= "C++ API for MySQL documentation"
|
||||||
|
|
||||||
VERSION= 1.7.9
|
VERSION= 2.0.6
|
||||||
DISTNAME= mysql++-${VERSION}
|
DISTNAME= mysql++-${VERSION}
|
||||||
PKGNAME= ${DISTNAME}p0
|
PKGNAME= ${DISTNAME}
|
||||||
PKGNAME-docs= mysql++-docs-${VERSION}p0
|
PKGNAME-docs= mysql++-docs-${VERSION}
|
||||||
CATEGORIES= devel
|
CATEGORIES= devel
|
||||||
|
|
||||||
HOMEPAGE= http://www.mysql.com/downloads/api-mysql++.html
|
HOMEPAGE= http://tangentsoft.net/mysql++/
|
||||||
|
|
||||||
MAINTAINER= Peter Stromberg <wilfried@openbsd.org>
|
MAINTAINER= Peter Stromberg <wilfried@openbsd.org>
|
||||||
|
|
||||||
@ -19,12 +21,7 @@ PERMIT_PACKAGE_FTP= Yes
|
|||||||
PERMIT_DISTFILES_CDROM= Yes
|
PERMIT_DISTFILES_CDROM= Yes
|
||||||
PERMIT_DISTFILES_FTP= Yes
|
PERMIT_DISTFILES_FTP= Yes
|
||||||
|
|
||||||
MASTER_SITES= ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/mysql++/ \
|
MASTER_SITES= ${HOMEPAGE}releases/
|
||||||
ftp://ftp.mysql.com/mysql++/
|
|
||||||
|
|
||||||
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltconfig \
|
|
||||||
${PORTSDIR}/infrastructure/patches/patch-lt1.3.3-ltmain_sh \
|
|
||||||
patch-*
|
|
||||||
|
|
||||||
MULTI_PACKAGES= -docs
|
MULTI_PACKAGES= -docs
|
||||||
SUBPACKAGE?=
|
SUBPACKAGE?=
|
||||||
@ -38,15 +35,12 @@ PKG_ARCH= *
|
|||||||
.endif
|
.endif
|
||||||
|
|
||||||
NO_REGRESS= Yes
|
NO_REGRESS= Yes
|
||||||
USE_GMAKE= Yes
|
|
||||||
CONFIGURE_STYLE= gnu
|
CONFIGURE_STYLE= gnu
|
||||||
CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include/mysql++
|
|
||||||
|
|
||||||
post-extract:
|
|
||||||
@rm -rf ${WRKSRC}/sqlplusint/.deps
|
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql++/html
|
.for dir in refman userman
|
||||||
${INSTALL_DATA} ${WRKSRC}/doc/man-html/* ${PREFIX}/share/doc/mysql++/html
|
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mysql++/${dir}/
|
||||||
|
${INSTALL_DATA} ${WRKSRC}/doc/${dir}/html/* ${PREFIX}/share/doc/mysql++/${dir}/
|
||||||
|
.endfor
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
MD5 (mysql++-1.7.9.tar.gz) = 1312fb4e33dcce07fac5fa9c2ac801f7
|
MD5 (mysql++-2.0.6.tar.gz) = 490f5d190674a427cca5fd22be6360e1
|
||||||
RMD160 (mysql++-1.7.9.tar.gz) = c82da7a9769b5cdcfefe01cd229fbf7561d25166
|
RMD160 (mysql++-2.0.6.tar.gz) = 7f0b25f7b809e9dfa95bb5ad6996d19eaff698ea
|
||||||
SHA1 (mysql++-1.7.9.tar.gz) = 3c0908a28ba9a61e24d30b0f9b598aae94eb884f
|
SHA1 (mysql++-2.0.6.tar.gz) = d9b8f2e6153c8a33e513e07fa16edd41b5205ff1
|
||||||
SIZE (mysql++-1.7.9.tar.gz) = 749476
|
SIZE (mysql++-2.0.6.tar.gz) = 1964604
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-Makefile_in,v 1.2 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- Makefile.in.orig 2001-05-19 18:44:46.000000000 +0200
|
|
||||||
+++ Makefile.in 2004-01-04 23:28:28.000000000 +0100
|
|
||||||
@@ -80,7 +80,7 @@ VERSION = @VERSION@
|
|
||||||
EXTRA_DIST = .version Configure doc devel
|
|
||||||
|
|
||||||
#SUBDIRS = sqlplusint examples doc
|
|
||||||
-SUBDIRS = sqlplusint examples
|
|
||||||
+SUBDIRS = sqlplusint
|
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
||||||
CONFIG_HEADER = config.h ./sqlplusint/exceptions.hh
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-configure_in,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- configure.in.orig 2001-05-19 18:44:46.000000000 +0200
|
|
||||||
+++ configure.in 2004-01-04 23:26:25.000000000 +0100
|
|
||||||
@@ -14,7 +14,7 @@ AM_CONFIG_HEADER(config.h sqlplusint/exc
|
|
||||||
|
|
||||||
AC_PROG_MAKE_SET
|
|
||||||
|
|
||||||
-AM_PROG_LIBTOOL
|
|
||||||
+AC_PROG_LIBTOOL
|
|
||||||
|
|
||||||
dnl Initialize maintainer mode
|
|
||||||
AM_MAINTAINER_MODE
|
|
||||||
@ -1,57 +0,0 @@
|
|||||||
$OpenBSD: patch-doc_man-html_5_Class_html,v 1.3 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- doc/man-html/5_Class.html.orig 2001-05-19 18:44:46.000000000 +0200
|
|
||||||
+++ doc/man-html/5_Class.html 2004-01-04 23:28:39.000000000 +0100
|
|
||||||
@@ -124,7 +124,7 @@ original version by: Nikos Drakos, CBLU
|
|
||||||
<LI><A NAME="tex2html1592"
|
|
||||||
HREF="5_Class.html#SECTION03232600000000000000">public operator bool ()</A>
|
|
||||||
<LI><A NAME="tex2html1593"
|
|
||||||
- HREF="5_Class.html#SECTION03232700000000000000">public string clinet_info ()</A>
|
|
||||||
+ HREF="5_Class.html#SECTION03232700000000000000">public string client_info ()</A>
|
|
||||||
<LI><A NAME="tex2html1594"
|
|
||||||
HREF="5_Class.html#SECTION03232800000000000000">public void close ()</A>
|
|
||||||
<LI><A NAME="tex2html1595"
|
|
||||||
@@ -1502,7 +1502,7 @@ original version by: Nikos Drakos, CBLU
|
|
||||||
HREF="5_Class.html#SECTION032253000000000000000">Protected methods</A>
|
|
||||||
<UL>
|
|
||||||
<LI><A NAME="tex2html2005"
|
|
||||||
- HREF="5_Class.html#SECTION032253100000000000000">protected bool Success </A>
|
|
||||||
+ HREF="5_Class.html#SECTION032253100000000000000">protected bool Success_ </A>
|
|
||||||
<LI><A NAME="tex2html2006"
|
|
||||||
HREF="5_Class.html#SECTION032253200000000000000">protected char* errmsg </A>
|
|
||||||
<LI><A NAME="tex2html2007"
|
|
||||||
@@ -3123,7 +3123,7 @@ Public methods</A>
|
|
||||||
<LI>operator <B>bool</B> ()
|
|
||||||
<BR><EM>returns success()</EM>
|
|
||||||
</LI>
|
|
||||||
-<LI>string <B>clinet_info</B> ()
|
|
||||||
+<LI>string <B>client_info</B> ()
|
|
||||||
</LI>
|
|
||||||
<LI>void <B>close</B> ()
|
|
||||||
</LI>
|
|
||||||
@@ -3381,7 +3381,7 @@ public operator bool ()</A>
|
|
||||||
<P>
|
|
||||||
|
|
||||||
<H3><A NAME="SECTION03232700000000000000">
|
|
||||||
-public string clinet_info ()</A>
|
|
||||||
+public string client_info ()</A>
|
|
||||||
</H3>
|
|
||||||
|
|
||||||
|
|
||||||
@@ -8055,7 +8055,7 @@ Protected methods</A>
|
|
||||||
</H3>
|
|
||||||
|
|
||||||
<UL>
|
|
||||||
-<LI>bool <B>Success</B>
|
|
||||||
+<LI>bool <B>Success_</B>
|
|
||||||
</LI>
|
|
||||||
<LI>char* <B>errmsg</B>
|
|
||||||
</LI>
|
|
||||||
@@ -8248,7 +8248,7 @@ Protected methods</A>
|
|
||||||
<P>
|
|
||||||
|
|
||||||
<H3><A NAME="SECTION032253100000000000000">
|
|
||||||
-protected bool Success </A>
|
|
||||||
+protected bool Success_ </A>
|
|
||||||
</H3>
|
|
||||||
|
|
||||||
|
|
||||||
62
devel/mysql++/patches/patch-ltmain_sh
Normal file
62
devel/mysql++/patches/patch-ltmain_sh
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
$OpenBSD: patch-ltmain_sh,v 1.3 2005/10/07 13:24:53 wilfried Exp $
|
||||||
|
--- ltmain.sh.orig Wed Sep 28 15:43:18 2005
|
||||||
|
+++ ltmain.sh Thu Oct 6 11:17:31 2005
|
||||||
|
@@ -1085,6 +1085,17 @@ compiler."
|
||||||
|
continue
|
||||||
|
;;
|
||||||
|
|
||||||
|
+ -pthread)
|
||||||
|
+ case $host in
|
||||||
|
+ *-*-openbsd*)
|
||||||
|
+ deplibs="$deplibs $arg"
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ continue
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
-module)
|
||||||
|
module=yes
|
||||||
|
continue
|
||||||
|
@@ -4580,40 +4591,6 @@ relink_command=\"$relink_command\""
|
||||||
|
# Exit here if they wanted silent mode.
|
||||||
|
test "$show" = ":" && exit 0
|
||||||
|
|
||||||
|
- echo "----------------------------------------------------------------------"
|
||||||
|
- echo "Libraries have been installed in:"
|
||||||
|
- for libdir in $libdirs; do
|
||||||
|
- echo " $libdir"
|
||||||
|
- done
|
||||||
|
- echo
|
||||||
|
- echo "If you ever happen to want to link against installed libraries"
|
||||||
|
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||||
|
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
||||||
|
- echo "flag during linking and do at least one of the following:"
|
||||||
|
- if test -n "$shlibpath_var"; then
|
||||||
|
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||||
|
- echo " during execution"
|
||||||
|
- fi
|
||||||
|
- if test -n "$runpath_var"; then
|
||||||
|
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||||
|
- echo " during linking"
|
||||||
|
- fi
|
||||||
|
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||||
|
- libdir=LIBDIR
|
||||||
|
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||||
|
-
|
||||||
|
- echo " - use the \`$flag' linker flag"
|
||||||
|
- fi
|
||||||
|
- if test -n "$admincmds"; then
|
||||||
|
- echo " - have your system administrator run these commands:$admincmds"
|
||||||
|
- fi
|
||||||
|
- if test -f /etc/ld.so.conf; then
|
||||||
|
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||||
|
- fi
|
||||||
|
- echo
|
||||||
|
- echo "See any operating system documentation about shared libraries for"
|
||||||
|
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||||
|
- echo "----------------------------------------------------------------------"
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
|
||||||
22
devel/mysql++/patches/patch-makemake_sh
Normal file
22
devel/mysql++/patches/patch-makemake_sh
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
$OpenBSD: patch-makemake_sh,v 1.1 2005/10/07 13:24:53 wilfried Exp $
|
||||||
|
--- makemake.sh.orig Mon Sep 26 16:21:50 2005
|
||||||
|
+++ makemake.sh Thu Oct 6 13:25:29 2005
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
-#!/bin/bash
|
||||||
|
+:
|
||||||
|
|
||||||
|
# Display usage message
|
||||||
|
-function usage() {
|
||||||
|
+function usage {
|
||||||
|
echo 'usage: makemake [simple] {gcc|mingw} [args]'
|
||||||
|
echo
|
||||||
|
echo ' You must give one of the compiler parameters:'
|
||||||
|
@@ -16,7 +16,7 @@ function usage() {
|
||||||
|
}
|
||||||
|
|
||||||
|
# Simplify a Makefile
|
||||||
|
-function simplify() {
|
||||||
|
+function simplify {
|
||||||
|
# Strip comments, remove pointless macros, remove $(EXE), substitute
|
||||||
|
# .o for .$(OBJ), remove $(LDSTARTUP), and squash multiple blank
|
||||||
|
# lines.
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_Makefile_in,v 1.2 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/Makefile.in.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/Makefile.in 2004-01-04 23:31:49.000000000 +0100
|
|
||||||
@@ -90,7 +90,7 @@ lib_LTLIBRARIES = libsqlplus.la
|
|
||||||
libsqlplus_la_SOURCES = coldata.cc connection.cc datetime.cc field_names.cc field_types.cc manip.cc query.cc result.cc set.cc sql_query.cc type_info.cc vallist.cc string_util.cc
|
|
||||||
|
|
||||||
|
|
||||||
-libsqlplus_la_LDFLAGS = -version-info $(SQLPLUS_MAJOR_VERSION):$(SQLPLUS_MINOR_VERSION):$(SQLPLUS_MICRO_VERSION)
|
|
||||||
+libsqlplus_la_LDFLAGS = -version-info $(SQLPLUS_MAJOR_VERSION):$(SQLPLUS_MINOR_VERSION)
|
|
||||||
|
|
||||||
include_HEADERS = sqlplus.hh coldata1.hh coldata2.hh coldata3.hh coldata4.hh compare1.hh compare2.hh compare3.hh connection0.hh connection1.hh connection2.hh connection3.hh const_string1.hh const_string2.hh const_string3.hh convert1.hh convert2.hh convert3.hh custom-macros.hh custom.hh datetime1.hh datetime2.hh datetime3.hh field_names1.hh field_names2.hh field_names3.hh field_types1.hh field_types2.hh field_types3.hh fields1.hh fields2.hh manip1.hh manip2.hh manip3.hh null1.hh null2.hh null3.hh query1.hh query2.hh query3.hh resiter1.hh result1.hh result2.hh result3.hh row1.hh row2.hh row3.hh set1.hh set2.hh set3.hh sql_query0.hh sql_query1.hh sql_query2.hh sql_query3.hh sql_string1.hh sql_string2.hh sql_string3.hh stream2string1.hh stream2string2.hh stream2string3.hh tiny_int1.hh tiny_int2.hh tiny_int3.hh type_info1.hh type_info2.hh type_info3.hh vallist1.hh vallist2.hh vallist3.hh string_util.hh mysql++ exceptions.hh define_short defs
|
|
||||||
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_coldata1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/coldata1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/coldata1.hh 2004-01-04 23:47:26.000000000 +0100
|
|
||||||
@@ -40,14 +40,14 @@ template <class Str>
|
|
||||||
class mysql_ColData : public Str {
|
|
||||||
private:
|
|
||||||
mysql_type_info _type;
|
|
||||||
- string buf;
|
|
||||||
+ std::string buf;
|
|
||||||
bool _null;
|
|
||||||
public:
|
|
||||||
- mysql_ColData (bool n, mysql_type_info t = mysql_type_info::string_type)
|
|
||||||
+ explicit mysql_ColData (bool n, mysql_type_info t = mysql_type_info::string_type)
|
|
||||||
: _type(t), _null(n) {}
|
|
||||||
- mysql_ColData (const char *str,
|
|
||||||
+ explicit mysql_ColData (const char *str,
|
|
||||||
mysql_type_info t = mysql_type_info::string_type, bool n = false)
|
|
||||||
- : Str(str), _type(t), _null(n) {buf=(string)str;}
|
|
||||||
+ : Str(str), _type(t), _null(n) {buf=(std::string)str;}
|
|
||||||
mysql_ColData () {}
|
|
||||||
mysql_type_info type() {return _type;}
|
|
||||||
//: Returns the current mysql type of current item
|
|
||||||
@@ -72,7 +72,7 @@ public:
|
|
||||||
// (Note, This is not an actual template)
|
|
||||||
void it_is_null (void) {_null=true;}
|
|
||||||
inline const bool is_null(void) const {return _null;}
|
|
||||||
- inline const string& get_string(void) const {return buf;}
|
|
||||||
+ inline const std::string& get_string(void) const {return buf;}
|
|
||||||
operator cchar*() const {return buf.c_str();}
|
|
||||||
operator signed char() const {return conv((signed char)0);}
|
|
||||||
operator unsigned char() const {return conv((unsigned char)0);}
|
|
||||||
@@ -95,7 +95,7 @@ public:
|
|
||||||
//: The Type that is returned by constant rows
|
|
||||||
typedef mysql_ColData<const_string> ColData;
|
|
||||||
//: The Type that is returned by mutable rows
|
|
||||||
-typedef mysql_ColData<string> MutableColData;
|
|
||||||
+typedef mysql_ColData<std::string> MutableColData;
|
|
||||||
//: For backwards compatibility. Do not use.
|
|
||||||
typedef ColData MysqlString;
|
|
||||||
//: For backwards compatibility. Do not use.
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_coldata4_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/coldata4.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/coldata4.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -9,7 +9,7 @@
|
|
||||||
|
|
||||||
template <class Str> template<class Type>
|
|
||||||
Type mysql_ColData<Str>::conv (Type dummy) const {
|
|
||||||
- string strbuf(buf);
|
|
||||||
+ std::string strbuf = buf;
|
|
||||||
strip_all_blanks(strbuf);
|
|
||||||
size_t len = strbuf.size();
|
|
||||||
const char *str = strbuf.c_str();
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_coldata_cc,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/coldata.cc.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/coldata.cc 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -2,5 +2,5 @@
|
|
||||||
#include "const_string3.hh"
|
|
||||||
#include "coldata4.hh"
|
|
||||||
|
|
||||||
-template class mysql_ColData<string>;
|
|
||||||
+template class mysql_ColData<std::string>;
|
|
||||||
template class mysql_ColData<const_string>;
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_compare1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/compare1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/compare1.hh 2004-01-05 00:31:52.000000000 +0100
|
|
||||||
@@ -1,11 +1,11 @@
|
|
||||||
#ifndef __compare1_hh__
|
|
||||||
#define __compare1_hh__
|
|
||||||
|
|
||||||
-#include <function.h>
|
|
||||||
+#include <functional>
|
|
||||||
#include "row1.hh"
|
|
||||||
|
|
||||||
template <class BinaryPred, class CmpType>
|
|
||||||
-class MysqlCmp : public unary_function<const MysqlRow&, bool>
|
|
||||||
+class MysqlCmp : public std::unary_function<const MysqlRow&, bool>
|
|
||||||
{
|
|
||||||
protected:
|
|
||||||
unsigned int index;
|
|
||||||
@@ -19,6 +19,7 @@ public:
|
|
||||||
template <class BinaryPred>
|
|
||||||
class MysqlCmpCStr : public MysqlCmp<BinaryPred, const char *>
|
|
||||||
{
|
|
||||||
+ class CmpType cmp2;
|
|
||||||
public:
|
|
||||||
MysqlCmpCStr(uint i, const BinaryPred &f, const char* c) : MysqlCmp<BinaryPred, const char *> (i,f,c) {}
|
|
||||||
bool operator () (const MysqlRow& cmp1) const
|
|
||||||
@@ -36,7 +37,7 @@ mysql_cmp(uint i, const BinaryPred &func
|
|
||||||
return MysqlCmp<BinaryPred, CmpType>(i, func, cmp2);
|
|
||||||
}
|
|
||||||
|
|
||||||
-typedef binary_function<const char*, const char*, bool> bin_char_pred;
|
|
||||||
+typedef std::binary_function<const char*, const char*, bool> bin_char_pred;
|
|
||||||
|
|
||||||
struct cstr_equal_to : bin_char_pred {
|
|
||||||
bool operator () (const char *x, const char *y) const
|
|
||||||
@ -1,147 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_connection1_hh,v 1.2 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/connection1.hh.orig 2001-05-19 18:44:49.000000000 +0200
|
|
||||||
+++ sqlplusint/connection1.hh 2004-01-05 18:58:19.000000000 +0100
|
|
||||||
@@ -8,13 +8,11 @@
|
|
||||||
#define errno WSAGetLastError()
|
|
||||||
#endif
|
|
||||||
#include <mysql.h>
|
|
||||||
-#include <vector.h>
|
|
||||||
-#include <deque.h>
|
|
||||||
-#include <list.h>
|
|
||||||
-#include <slist.h>
|
|
||||||
-#include <set.h>
|
|
||||||
-#include <map.h>
|
|
||||||
-#include <multiset.h>
|
|
||||||
+#include <vector>
|
|
||||||
+#include <deque>
|
|
||||||
+#include <list>
|
|
||||||
+#include <set>
|
|
||||||
+#include <map>
|
|
||||||
#include "define_short"
|
|
||||||
#include "exceptions.hh"
|
|
||||||
#include "query1.hh"
|
|
||||||
@@ -22,21 +20,21 @@
|
|
||||||
|
|
||||||
//: The main database handle
|
|
||||||
class Connection {
|
|
||||||
- friend ResNSel;
|
|
||||||
- friend ResUse;
|
|
||||||
- friend Query;
|
|
||||||
+ friend class ResNSel;
|
|
||||||
+ friend class ResUse;
|
|
||||||
+ friend class Query;
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool throw_exceptions;
|
|
||||||
MYSQL mysql;
|
|
||||||
bool is_connected;
|
|
||||||
bool locked;
|
|
||||||
- bool Success;
|
|
||||||
+ bool Success_;
|
|
||||||
|
|
||||||
public:
|
|
||||||
Connection () : throw_exceptions(true), locked(false)
|
|
||||||
{mysql_init(&mysql);} //:
|
|
||||||
- Connection (bool te) : throw_exceptions(te), is_connected(false), locked(true), Success(false) //:
|
|
||||||
+ Connection (bool te) : throw_exceptions(te), is_connected(false), locked(true), Success_(false) //:
|
|
||||||
{mysql_init(&mysql);} //:
|
|
||||||
Connection (const char *db, const char *host = "", const char *user = "",
|
|
||||||
const char *passwd = "", bool te = true); //:
|
|
||||||
@@ -52,12 +50,12 @@ public:
|
|
||||||
|
|
||||||
~Connection (); //:
|
|
||||||
void close() {mysql_close(&mysql);} //:
|
|
||||||
- string info (); //:
|
|
||||||
+ std::string info (); //:
|
|
||||||
|
|
||||||
bool connected() const {return is_connected;}
|
|
||||||
//: returns true if a successful connection was made
|
|
||||||
|
|
||||||
- bool success() {return Success;}
|
|
||||||
+ bool success() {return Success_;}
|
|
||||||
//: returns true of the last query was successful
|
|
||||||
|
|
||||||
bool connect (cchar *db = "", cchar *host = "",
|
|
||||||
@@ -74,59 +72,57 @@ public:
|
|
||||||
//:
|
|
||||||
|
|
||||||
operator bool () {return success();} //: returns success()
|
|
||||||
- string error () {return string(mysql_error(&mysql));} //: last error message()
|
|
||||||
+ std::string error () {return std::string(mysql_error(&mysql));} //: last error message()
|
|
||||||
int errnum () {return mysql_errno(&mysql);}
|
|
||||||
int refresh (unsigned int refresh_options){ return mysql_refresh (&mysql,refresh_options); }
|
|
||||||
int ping (void) { return mysql_ping(&mysql);}
|
|
||||||
int kill (unsigned long pid) { return mysql_kill (&mysql,pid);}
|
|
||||||
- string client_info () {return string(mysql_get_client_info());} //:
|
|
||||||
+ std::string client_info () {return std::string(mysql_get_client_info());} //:
|
|
||||||
|
|
||||||
- string host_info () {return string(mysql_get_host_info(&mysql));} //:
|
|
||||||
+ std::string host_info () {return std::string(mysql_get_host_info(&mysql));} //:
|
|
||||||
|
|
||||||
int proto_info () {return mysql_get_proto_info(&mysql);} //:
|
|
||||||
|
|
||||||
- string server_info () {return string(mysql_get_server_info(&mysql));} //:
|
|
||||||
+ std::string server_info () {return std::string(mysql_get_server_info(&mysql));} //:
|
|
||||||
|
|
||||||
- string stat() {return string(mysql_stat(&mysql));} //:
|
|
||||||
+ std::string stat() {return std::string(mysql_stat(&mysql));} //:
|
|
||||||
|
|
||||||
- Result store(const string &str) {return store(str, throw_exceptions);} //:
|
|
||||||
- ResUse use(const string &str) {return use(str, throw_exceptions);} //:
|
|
||||||
- ResNSel execute(const string &str) {return execute(str, throw_exceptions);} //:
|
|
||||||
- bool exec (const string &str);
|
|
||||||
- Result store(const string &str, bool te); //:
|
|
||||||
- ResUse use(const string &str, bool te); //:
|
|
||||||
- ResNSel execute(const string &str, bool te); //:
|
|
||||||
+ Result store(const std::string &str) {return store(str, throw_exceptions);} //:
|
|
||||||
+ ResUse use(const std::string &str) {return use(str, throw_exceptions);} //:
|
|
||||||
+ ResNSel execute(const std::string &str) {return execute(str, throw_exceptions);} //:
|
|
||||||
+ bool exec (const std::string &str);
|
|
||||||
+ Result store(const std::string &str, bool te); //:
|
|
||||||
+ ResUse use(const std::string &str, bool te); //:
|
|
||||||
+ ResNSel execute(const std::string &str, bool te); //:
|
|
||||||
|
|
||||||
- bool create_db (string db) {return !(execute( "CREATE DATABASE " + db ));} //:
|
|
||||||
- bool drop_db (string db) {return !(execute( "DROP DATABASE " + db ));} //:
|
|
||||||
- bool select_db (string db) {return select_db(db.c_str());} //:
|
|
||||||
+ bool create_db (std::string db) {return !(execute( "CREATE DATABASE " + db ));} //:
|
|
||||||
+ bool drop_db (std::string db) {return !(execute( "DROP DATABASE " + db ));} //:
|
|
||||||
+ bool select_db (std::string db) {return select_db(db.c_str());} //:
|
|
||||||
bool select_db (const char *db); //:
|
|
||||||
bool reload(); //:
|
|
||||||
bool shutdown (); //:
|
|
||||||
- string infoo (void) {return info ();}
|
|
||||||
+ std::string infoo (void) {return info ();}
|
|
||||||
st_mysql_options get_options (void) const {return mysql.options;}
|
|
||||||
int read_options(enum mysql_option option,const char *arg) {return mysql_options(&mysql, option,arg);}
|
|
||||||
int affected_rows() {return mysql_affected_rows((MYSQL*) &mysql);}
|
|
||||||
int insert_id () {return mysql_insert_id(&mysql);}
|
|
||||||
|
|
||||||
- template <class Sequence> void storein_sequence(Sequence &, const string &); //:
|
|
||||||
- template <class Set> void storein_set(Set &, const string &); //:
|
|
||||||
+ template <class Sequence> void storein_sequence(Sequence &, const std::string &); //:
|
|
||||||
+ template <class Set> void storein_set(Set &, const std::string &); //:
|
|
||||||
|
|
||||||
//!dummy: void storein(TYPE &con, const string &s);
|
|
||||||
//: Stores the results in TYPE.
|
|
||||||
// Stores the result in TYPE. TYPE must be some sort of STL container.
|
|
||||||
|
|
||||||
- template <class T> void storein(vector<T> &con, const string &s)
|
|
||||||
+ template <class T> void storein(std::vector<T> &con, const std::string &s)
|
|
||||||
{storein_sequence(con,s);}
|
|
||||||
- template <class T> void storein(deque<T> &con, const string &s)
|
|
||||||
+ template <class T> void storein(std::deque<T> &con, const std::string &s)
|
|
||||||
{storein_sequence(con,s);}
|
|
||||||
- template <class T> void storein(list<T> &con, const string &s)
|
|
||||||
+ template <class T> void storein(std::list<T> &con, const std::string &s)
|
|
||||||
{storein_sequence(con,s);}
|
|
||||||
- template <class T> void storein(slist<T> &con, const string &s)
|
|
||||||
- {storein_sequence(con,s);}
|
|
||||||
- template <class T> void storein(set<T> &con, const string &s)
|
|
||||||
+ template <class T> void storein(std::set<T> &con, const std::string &s)
|
|
||||||
{storein_set(con,s);}
|
|
||||||
- template <class T> void storein(multiset<T> &con, const string &s)
|
|
||||||
+ template <class T> void storein(std::multiset<T> &con, const std::string &s)
|
|
||||||
{storein_set(con,s);}
|
|
||||||
};
|
|
||||||
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_connection2_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/connection2.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/connection2.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -7,7 +7,7 @@
|
|
||||||
inline Query Connection::query() {return Query(this, throw_exceptions);}
|
|
||||||
|
|
||||||
template <class Sequence>
|
|
||||||
-void Connection::storein_sequence (Sequence &seq, const string &str) {
|
|
||||||
+void Connection::storein_sequence (Sequence &seq, const std::string &str) {
|
|
||||||
ResUse result = use(str);
|
|
||||||
while (1) {
|
|
||||||
MYSQL_ROW d = mysql_fetch_row(result.mysql_res);
|
|
||||||
@@ -19,7 +19,7 @@ void Connection::storein_sequence (Seque
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Set>
|
|
||||||
-void Connection::storein_set (Set &sett, const string &str) {
|
|
||||||
+void Connection::storein_set (Set &sett, const std::string &str) {
|
|
||||||
ResUse result = use(str);
|
|
||||||
while (1) {
|
|
||||||
MYSQL_ROW d = mysql_fetch_row(result.mysql_res);
|
|
||||||
@ -1,182 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_connection_cc,v 1.6 2005/09/08 01:51:00 pvalchev Exp $
|
|
||||||
--- sqlplusint/connection.cc.orig Sat May 19 10:44:48 2001
|
|
||||||
+++ sqlplusint/connection.cc Wed Sep 7 18:46:47 2005
|
|
||||||
@@ -2,6 +2,8 @@
|
|
||||||
#include "connection3.hh"
|
|
||||||
#include "result3.hh"
|
|
||||||
|
|
||||||
+using namespace std;
|
|
||||||
+
|
|
||||||
Connection::Connection (const char *db, const char *host, const char *user,
|
|
||||||
const char *passwd, bool te)
|
|
||||||
: throw_exceptions(te), locked(false)
|
|
||||||
@@ -10,38 +12,38 @@ Connection::Connection (const char *db,
|
|
||||||
if (real_connect (db, host, user, passwd,3306,0,60,NULL,0))
|
|
||||||
{
|
|
||||||
locked = false;
|
|
||||||
- Success = is_connected = true;
|
|
||||||
+ Success_ = is_connected = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- locked = false; Success = is_connected = false;
|
|
||||||
+ locked = false; Success_ = is_connected = false;
|
|
||||||
if (throw_exceptions) throw BadQuery(error());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Connection::Connection (const char *db, const char *host, const char *user,
|
|
||||||
- const char *passwd, uint port, my_bool compress = 0,
|
|
||||||
- unsigned int connect_timeout = 60, bool te = true,
|
|
||||||
- const char *socket_name = "", unsigned client_flag = 0)
|
|
||||||
+ const char *passwd, uint port, my_bool compress,
|
|
||||||
+ unsigned int connect_timeout, bool te,
|
|
||||||
+ const char *socket_name, unsigned client_flag)
|
|
||||||
: throw_exceptions(te), locked(false)
|
|
||||||
{
|
|
||||||
mysql_init(&mysql);
|
|
||||||
if (real_connect (db, host, user, passwd, port, compress, connect_timeout,socket_name, client_flag))
|
|
||||||
{
|
|
||||||
locked = false;
|
|
||||||
- Success = is_connected = true;
|
|
||||||
+ Success_ = is_connected = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- locked = false; Success = is_connected = false;
|
|
||||||
+ locked = false; Success_ = is_connected = false;
|
|
||||||
if (throw_exceptions) throw BadQuery(error());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Connection::real_connect (cchar *db, cchar *host, cchar *user,
|
|
||||||
- cchar *passwd, uint port, my_bool compress = 0,
|
|
||||||
- unsigned int connect_timeout = 60,
|
|
||||||
- const char *socket_name = "", unsigned int client_flag = 0)
|
|
||||||
+ cchar *passwd, uint port, my_bool compress,
|
|
||||||
+ unsigned int connect_timeout,
|
|
||||||
+ const char *socket_name, unsigned int client_flag)
|
|
||||||
{
|
|
||||||
mysql.options.compress = compress;
|
|
||||||
mysql.options.connect_timeout=connect_timeout;
|
|
||||||
@@ -52,18 +54,18 @@ bool Connection::real_connect (cchar *db
|
|
||||||
if (mysql_real_connect(&mysql,host,user,passwd,db, port,socket_name,client_flag))
|
|
||||||
{
|
|
||||||
locked = false;
|
|
||||||
- Success = is_connected = true;
|
|
||||||
+ Success_ = is_connected = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
- locked = false; Success = is_connected = false;
|
|
||||||
+ locked = false; Success_ = is_connected = false;
|
|
||||||
if (throw_exceptions) throw BadQuery(error());
|
|
||||||
}
|
|
||||||
// mysql.options.my_cnf_file=0;
|
|
||||||
- if (!Success) return Success;
|
|
||||||
+ if (!Success_) return Success_;
|
|
||||||
if (db && db[0]) // if db is not empty
|
|
||||||
- Success = select_db(db);
|
|
||||||
- return Success;
|
|
||||||
+ Success_ = select_db(db);
|
|
||||||
+ return Success_;
|
|
||||||
}
|
|
||||||
|
|
||||||
Connection::~Connection () {
|
|
||||||
@@ -83,7 +85,11 @@ bool Connection::reload() {
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Connection::shutdown () {
|
|
||||||
+#if (MYSQL_VERSION_ID >= 40103 && MYSQL_VERSION_ID != 50000)
|
|
||||||
+ bool suc = !(mysql_shutdown(&mysql, SHUTDOWN_DEFAULT));
|
|
||||||
+#else
|
|
||||||
bool suc = !(mysql_shutdown(&mysql));
|
|
||||||
+#endif
|
|
||||||
if (throw_exceptions && !suc) throw MysqlBadQuery(error());
|
|
||||||
else return suc;
|
|
||||||
}
|
|
||||||
@@ -95,21 +101,21 @@ bool Connection::connect (cchar *db, cch
|
|
||||||
|
|
||||||
if (mysql_real_connect(&mysql,host,user,passwd,db, 3306,NULL,0)) {
|
|
||||||
locked = false;
|
|
||||||
- Success = is_connected = true;
|
|
||||||
+ Success_ = is_connected = true;
|
|
||||||
} else {
|
|
||||||
locked = false;
|
|
||||||
if (throw_exceptions) throw BadQuery(error());
|
|
||||||
- Success = is_connected = false;
|
|
||||||
+ Success_ = is_connected = false;
|
|
||||||
}
|
|
||||||
// mysql.options.my_cnf_file=0;
|
|
||||||
- if (!Success) return Success;
|
|
||||||
+ if (!Success_) return Success_;
|
|
||||||
if (db && db[0]) // if db is not empty
|
|
||||||
- Success = select_db(db);
|
|
||||||
- return Success;
|
|
||||||
+ Success_ = select_db(db);
|
|
||||||
+ return Success_;
|
|
||||||
}
|
|
||||||
|
|
||||||
string Connection::info () {
|
|
||||||
- char *i = mysql_info(&mysql);
|
|
||||||
+ const char *i = mysql_info(&mysql);
|
|
||||||
if (!i)
|
|
||||||
return string();
|
|
||||||
else
|
|
||||||
@@ -117,44 +123,44 @@ string Connection::info () {
|
|
||||||
}
|
|
||||||
|
|
||||||
ResNSel Connection::execute(const string &str, bool throw_excptns) {
|
|
||||||
- Success = false;
|
|
||||||
+ Success_ = false;
|
|
||||||
if (lock())
|
|
||||||
if (throw_excptns) throw BadQuery(error());
|
|
||||||
else return ResNSel();
|
|
||||||
- Success = !mysql_query(&mysql, str.c_str());
|
|
||||||
+ Success_ = !mysql_query(&mysql, str.c_str());
|
|
||||||
unlock();
|
|
||||||
- if (!Success)
|
|
||||||
+ if (!Success_)
|
|
||||||
if (throw_excptns) throw BadQuery(error());
|
|
||||||
else return ResNSel();
|
|
||||||
return ResNSel(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool Connection::exec(const string &str) {
|
|
||||||
- Success = !mysql_query(&mysql,str.c_str());
|
|
||||||
- if (!Success && throw_exceptions) throw BadQuery(error());
|
|
||||||
- return Success;
|
|
||||||
+ Success_ = !mysql_query(&mysql,str.c_str());
|
|
||||||
+ if (!Success_ && throw_exceptions) throw BadQuery(error());
|
|
||||||
+ return Success_;
|
|
||||||
}
|
|
||||||
|
|
||||||
Result Connection::store(const string &str, bool throw_excptns) {
|
|
||||||
- Success = false;
|
|
||||||
+ Success_ = false;
|
|
||||||
if (lock())
|
|
||||||
if (throw_excptns) throw BadQuery(error());
|
|
||||||
else return Result();
|
|
||||||
- Success = !mysql_query(&mysql, str.c_str());
|
|
||||||
+ Success_ = !mysql_query(&mysql, str.c_str());
|
|
||||||
unlock();
|
|
||||||
- if (!Success)
|
|
||||||
+ if (!Success_)
|
|
||||||
if (throw_excptns) throw BadQuery(error());
|
|
||||||
else return Result();
|
|
||||||
return Result(mysql_store_result(&mysql));
|
|
||||||
}
|
|
||||||
|
|
||||||
ResUse Connection::use(const string &str, bool throw_excptns) {
|
|
||||||
- Success = false;
|
|
||||||
+ Success_ = false;
|
|
||||||
if (lock())
|
|
||||||
if (throw_excptns) throw BadQuery(error());
|
|
||||||
else return ResUse();
|
|
||||||
- Success = !mysql_query(&mysql, str.c_str());
|
|
||||||
- if (!Success)
|
|
||||||
+ Success_ = !mysql_query(&mysql, str.c_str());
|
|
||||||
+ if (!Success_)
|
|
||||||
if (throw_excptns) throw BadQuery(error());
|
|
||||||
else return ResUse();
|
|
||||||
return ResUse(mysql_use_result(&mysql), this);
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_const_string1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/const_string1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/const_string1.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -47,7 +47,7 @@ public:
|
|
||||||
const_reference operator[](size_type pos) const {return str_data[pos];} //:
|
|
||||||
const_reference at(size_type pos) const //:
|
|
||||||
{
|
|
||||||
- if (pos >= size()) throw out_of_range("");
|
|
||||||
+ if (pos >= size()) throw std::out_of_range("");
|
|
||||||
else return str_data[pos];
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -67,7 +67,7 @@ public:
|
|
||||||
//! with_class = const_string
|
|
||||||
|
|
||||||
//:
|
|
||||||
-inline ostream& operator << (ostream &o, const const_string &str) {
|
|
||||||
+inline std::ostream& operator << (std::ostream &o, const const_string &str) {
|
|
||||||
return o << str.c_str();
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_custom_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/custom.hh.orig 2001-05-19 18:44:49.000000000 +0200
|
|
||||||
+++ sqlplusint/custom.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -8,7 +8,7 @@
|
|
||||||
enum sql_dummy_type {sql_dummy};
|
|
||||||
enum sql_cmp_type {sql_use_compare};
|
|
||||||
|
|
||||||
-inline int sql_cmp(const string &a, const string &b) {
|
|
||||||
+inline int sql_cmp(const std::string &a, const std::string &b) {
|
|
||||||
return a.compare(b);
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_custom_pl,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/custom.pl.orig 2001-05-19 18:44:49.000000000 +0200
|
|
||||||
+++ sqlplusint/custom.pl 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -13,7 +13,7 @@ print OUT0 << "---";
|
|
||||||
enum sql_dummy_type {sql_dummy};
|
|
||||||
enum sql_cmp_type {sql_use_compare};
|
|
||||||
|
|
||||||
-inline int sql_cmp(const string &a, const string &b) {
|
|
||||||
+inline int sql_cmp(const std::string &a, const std::string &b) {
|
|
||||||
return a.compare(b);
|
|
||||||
}
|
|
||||||
---
|
|
||||||
@ -1,95 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_datetime1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/datetime1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/datetime1.hh 2004-01-04 23:52:50.000000000 +0100
|
|
||||||
@@ -9,8 +9,7 @@
|
|
||||||
#define __datetime1_hh__
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
-#include <strstream.h>
|
|
||||||
-#include <iostream.h>
|
|
||||||
+#include <iostream>
|
|
||||||
#include "defs"
|
|
||||||
#include "define_short"
|
|
||||||
#include "coldata1.hh"
|
|
||||||
@@ -18,9 +17,9 @@
|
|
||||||
#include "tiny_int1.hh"
|
|
||||||
|
|
||||||
struct mysql_dt_base {
|
|
||||||
- virtual ostream& out_stream(ostream&) const = 0;
|
|
||||||
+ virtual std::ostream& out_stream(std::ostream&) const = 0;
|
|
||||||
|
|
||||||
- operator string ();
|
|
||||||
+ operator std::string ();
|
|
||||||
};
|
|
||||||
|
|
||||||
template <class T>
|
|
||||||
@@ -40,7 +39,7 @@ struct mysql_date : virtual public mysql
|
|
||||||
tiny_int month;
|
|
||||||
tiny_int day;
|
|
||||||
|
|
||||||
- ostream& out_stream(ostream&) const;
|
|
||||||
+ std::ostream& out_stream(std::ostream&) const;
|
|
||||||
cchar* convert (cchar*);
|
|
||||||
protected:
|
|
||||||
short int compare(const mysql_date *other) const;
|
|
||||||
@@ -71,13 +70,13 @@ struct Date : public mysql_date, public
|
|
||||||
Date () {};
|
|
||||||
Date (cchar* str) {convert(str);}
|
|
||||||
Date (const ColData &str);
|
|
||||||
- Date (const string &str);
|
|
||||||
+ Date (const std::string &str);
|
|
||||||
|
|
||||||
short int compare(const Date& other) const
|
|
||||||
{return mysql_date::compare(&other);}
|
|
||||||
};
|
|
||||||
|
|
||||||
-inline ostream& operator << (ostream& s, const Date& d)
|
|
||||||
+inline std::ostream& operator << (std::ostream& s, const Date& d)
|
|
||||||
{return d.out_stream(s);}
|
|
||||||
|
|
||||||
struct mysql_time : virtual public mysql_dt_base {
|
|
||||||
@@ -85,7 +84,7 @@ struct mysql_time : virtual public mysql
|
|
||||||
tiny_int minute;
|
|
||||||
tiny_int second;
|
|
||||||
|
|
||||||
- ostream& out_stream(ostream&) const;
|
|
||||||
+ std::ostream& out_stream(std::ostream&) const;
|
|
||||||
cchar* convert (cchar*);
|
|
||||||
protected:
|
|
||||||
short int compare(const mysql_time *other) const;
|
|
||||||
@@ -116,14 +115,14 @@ struct Time : public mysql_time, public
|
|
||||||
Time () {};
|
|
||||||
Time (cchar* str) {convert(str);}
|
|
||||||
Time (const ColData &str);
|
|
||||||
- Time (const string &str);
|
|
||||||
+ Time (const std::string &str);
|
|
||||||
|
|
||||||
short int compare(const Time& other) const
|
|
||||||
{return mysql_time::compare(&other);}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-inline ostream& operator << (ostream& s, const Time& d)
|
|
||||||
+inline std::ostream& operator << (std::ostream& s, const Time& d)
|
|
||||||
{return d.out_stream(s);}
|
|
||||||
|
|
||||||
//: A combinate of Date and Time for holding mysql DateTime's
|
|
||||||
@@ -135,15 +134,15 @@ struct DateTime : public mysql_date, pub
|
|
||||||
DateTime () {}
|
|
||||||
DateTime (cchar* str) {convert(str);}
|
|
||||||
DateTime (const ColData &str);
|
|
||||||
- DateTime (const string &str);
|
|
||||||
+ DateTime (const std::string &str);
|
|
||||||
|
|
||||||
short int compare(const DateTime& other) const;
|
|
||||||
|
|
||||||
- ostream& out_stream(ostream&) const;
|
|
||||||
+ std::ostream& out_stream(std::ostream&) const;
|
|
||||||
cchar* convert (cchar*);
|
|
||||||
};
|
|
||||||
|
|
||||||
-inline ostream& operator << (ostream& s, const DateTime& d)
|
|
||||||
+inline std::ostream& operator << (std::ostream& s, const DateTime& d)
|
|
||||||
{return d.out_stream(s);}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_datetime2_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/datetime2.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/datetime2.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -5,17 +5,17 @@
|
|
||||||
#include "coldata2.hh"
|
|
||||||
#include "stream2string2.hh"
|
|
||||||
|
|
||||||
-inline mysql_dt_base::operator string () {
|
|
||||||
- return stream2string<string>(*this);
|
|
||||||
+inline mysql_dt_base::operator std::string () {
|
|
||||||
+ return stream2string<std::string>(*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline Date::Date (const ColData &str) {convert(str.c_str());}
|
|
||||||
-inline Date::Date (const string &str) {convert(str.c_str());}
|
|
||||||
+inline Date::Date (const std::string &str) {convert(str.c_str());}
|
|
||||||
|
|
||||||
inline Time::Time (const ColData &str) {convert(str.c_str());}
|
|
||||||
-inline Time::Time (const string &str) {convert(str.c_str());}
|
|
||||||
+inline Time::Time (const std::string &str) {convert(str.c_str());}
|
|
||||||
|
|
||||||
inline DateTime::DateTime (const ColData &str) {convert(str.c_str());}
|
|
||||||
-inline DateTime::DateTime (const string &str) {convert(str.c_str());}
|
|
||||||
+inline DateTime::DateTime (const std::string &str) {convert(str.c_str());}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,56 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_datetime_cc,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/datetime.cc.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/datetime.cc 2004-01-04 23:27:18.000000000 +0100
|
|
||||||
@@ -7,39 +7,39 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "datetime3.hh"
|
|
||||||
-#include <iomanip.h>
|
|
||||||
+#include <iomanip>
|
|
||||||
|
|
||||||
-ostream& mysql_date::out_stream (ostream& s) const {
|
|
||||||
+std::ostream& mysql_date::out_stream (std::ostream& s) const {
|
|
||||||
char fill = s.fill('0');
|
|
||||||
#ifdef __USLC__
|
|
||||||
long flags = s.setf(ios::right);
|
|
||||||
#else
|
|
||||||
- ios::fmtflags flags = s.setf(ios::right);
|
|
||||||
+ std::ios::fmtflags flags = s.setf(std::ios::right);
|
|
||||||
#endif
|
|
||||||
- s << setw(4) << year << '-'
|
|
||||||
- << setw(2) << month << '-'
|
|
||||||
- << setw(2) << day;
|
|
||||||
+ s << std::setw(4) << year << '-'
|
|
||||||
+ << std::setw(2) << month << '-'
|
|
||||||
+ << std::setw(2) << day;
|
|
||||||
s.flags(flags);
|
|
||||||
s.fill(fill);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
-ostream& mysql_time::out_stream (ostream& s) const {
|
|
||||||
+std::ostream& mysql_time::out_stream (std::ostream& s) const {
|
|
||||||
char fill = s.fill('0');
|
|
||||||
#ifdef __USLC__
|
|
||||||
- long flags = s.setf(ios::right);
|
|
||||||
+ long flags = s.setf(std::ios::right);
|
|
||||||
#else
|
|
||||||
- ios::fmtflags flags = s.setf(ios::right);
|
|
||||||
+ std::ios::fmtflags flags = s.setf(std::ios::right);
|
|
||||||
#endif
|
|
||||||
- s << setw(2) << hour << ':'
|
|
||||||
- << setw(2) << minute << ':'
|
|
||||||
- << setw(2) << second;
|
|
||||||
+ s << std::setw(2) << hour << ':'
|
|
||||||
+ << std::setw(2) << minute << ':'
|
|
||||||
+ << std::setw(2) << second;
|
|
||||||
s.flags(flags);
|
|
||||||
s.fill(fill);
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
-ostream& MysqlDateTime::out_stream (ostream& s) const {
|
|
||||||
+std::ostream& MysqlDateTime::out_stream (std::ostream& s) const {
|
|
||||||
mysql_date::out_stream(s);
|
|
||||||
s << " ";
|
|
||||||
mysql_time::out_stream(s);
|
|
||||||
@ -1,96 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_exceptions_hh_in,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/exceptions.hh.in.orig 2001-05-19 18:44:49.000000000 +0200
|
|
||||||
+++ sqlplusint/exceptions.hh.in 2004-01-04 23:39:41.000000000 +0100
|
|
||||||
@@ -10,66 +10,70 @@
|
|
||||||
// with --enable-exception flag.
|
|
||||||
|
|
||||||
//: Exception thrown when a BadQuery is encountered
|
|
||||||
-class BadQuery : public exception {
|
|
||||||
+class BadQuery : public std::exception {
|
|
||||||
public:
|
|
||||||
- BadQuery(const string &er = "") : error(er) {}
|
|
||||||
- const string error; //: The error message
|
|
||||||
- virtual const char* what( void ) const { return error.c_str(); }
|
|
||||||
+ BadQuery(const std::string &er = "") : error(er) {}
|
|
||||||
+ ~BadQuery() throw () {}
|
|
||||||
+ const std::string error; //: The error message
|
|
||||||
+ virtual const char* what( void ) const throw () { return error.c_str(); }
|
|
||||||
};
|
|
||||||
|
|
||||||
//: Exception structure thrown when a bad conversion takes place
|
|
||||||
-class BadConversion : public exception {
|
|
||||||
- const string _what;
|
|
||||||
+class BadConversion : public std::exception {
|
|
||||||
+ const std::string _what;
|
|
||||||
public:
|
|
||||||
const char* type_name; //:
|
|
||||||
- const string data; //:
|
|
||||||
+ const std::string data; //:
|
|
||||||
size_t retrieved; //:
|
|
||||||
size_t actual_size;//:
|
|
||||||
BadConversion(const char* tn, const char* d, size_t r, size_t a)
|
|
||||||
- : _what(string("Tried to convert \"") + string(d ? d : "") + "\" to a \"" + string(tn ? tn : "")),
|
|
||||||
+ : _what(std::string("Tried to convert \"") + std::string(d ? d : "") + "\" to a \"" + std::string(tn ? tn : "")),
|
|
||||||
type_name(tn), data(d), retrieved(r), actual_size(a) {};
|
|
||||||
|
|
||||||
- BadConversion(const string &wt, const char* tn, const char* d, size_t r, size_t a)
|
|
||||||
+ BadConversion(const std::string &wt, const char* tn, const char* d, size_t r, size_t a)
|
|
||||||
: _what(wt), type_name(tn), data(d), retrieved(r), actual_size(a) {};
|
|
||||||
|
|
||||||
- BadConversion(const string& wt = "")
|
|
||||||
+ BadConversion(const std::string& wt = "")
|
|
||||||
: _what(wt), type_name("unknown"), data(""), retrieved(0), actual_size(0) {};
|
|
||||||
+ ~BadConversion() throw () {}
|
|
||||||
|
|
||||||
- virtual const char* what( void ) const { return _what.c_str(); }
|
|
||||||
+ virtual const char* what( void ) const throw () { return _what.c_str(); }
|
|
||||||
};
|
|
||||||
|
|
||||||
//: Thrown when a *Null* value is trying to be converted into a type
|
|
||||||
//: it can't convert to.
|
|
||||||
-class BadNullConversion : public exception {
|
|
||||||
- const string _what;
|
|
||||||
+class BadNullConversion : public std::exception {
|
|
||||||
+ const std::string _what;
|
|
||||||
public:
|
|
||||||
- BadNullConversion(const string &wt = "") : _what(wt) {}
|
|
||||||
- virtual const char* what( void ) const { return _what.c_str(); }
|
|
||||||
+ BadNullConversion(const std::string &wt = "") : _what(wt) {}
|
|
||||||
+ ~BadNullConversion() throw () {}
|
|
||||||
+ virtual const char* what( void ) const throw () { return _what.c_str(); }
|
|
||||||
};
|
|
||||||
|
|
||||||
//: Exception thrown when not enough parameters are provided
|
|
||||||
// Thrown when not enough parameters are provided for a
|
|
||||||
// template query.
|
|
||||||
-class SQLQueryNEParms : public exception {
|
|
||||||
- const string _what;
|
|
||||||
+class SQLQueryNEParms : public std::exception {
|
|
||||||
+ const std::string _what;
|
|
||||||
public:
|
|
||||||
- SQLQueryNEParms(const char *c) : _what(string(c ? c : "")), error(c) {}
|
|
||||||
+ SQLQueryNEParms(const char *c) : _what(std::string(c ? c : "")), error(c) {}
|
|
||||||
+ ~SQLQueryNEParms() throw () {}
|
|
||||||
const char* error; //:
|
|
||||||
- virtual const char* what( void ) const { return _what.c_str(); }
|
|
||||||
+ virtual const char* what( void ) const throw () { return _what.c_str(); }
|
|
||||||
};
|
|
||||||
|
|
||||||
#else //origional, default exception style
|
|
||||||
|
|
||||||
struct BadQuery {
|
|
||||||
- BadQuery(string er) : error(er) {}
|
|
||||||
- string error; //: The error message
|
|
||||||
+ BadQuery(std::string er) : error(er) {}
|
|
||||||
+ std::string error; //: The error message
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
//: Exception structure thrown when a bad conversion takes place
|
|
||||||
struct BadConversion {
|
|
||||||
const char* type_name; //:
|
|
||||||
- const string data; //:
|
|
||||||
+ const std::string data; //:
|
|
||||||
size_t retrieved; //:
|
|
||||||
size_t actual_size;//:
|
|
||||||
BadConversion(const char* tn, const char* d, size_t r, size_t a) : type_name(tn), data(d), retrieved(r), actual_size(a) {};
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_field_names1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/field_names1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/field_names1.hh 2004-01-05 18:58:32.000000000 +0100
|
|
||||||
@@ -2,37 +2,37 @@
|
|
||||||
#ifndef __field_names1_hh__
|
|
||||||
#define __field_names1_hh__
|
|
||||||
|
|
||||||
-#include <vector.h>
|
|
||||||
-#include <algo.h>
|
|
||||||
+#include <vector>
|
|
||||||
+#include <algorithm>
|
|
||||||
#include "defs"
|
|
||||||
#include "define_short"
|
|
||||||
#include "coldata1.hh"
|
|
||||||
#include "string_util.hh"
|
|
||||||
|
|
||||||
//: A vector of the field names.
|
|
||||||
-class FieldNames : public vector<string> {
|
|
||||||
+class FieldNames : public std::vector<std::string> {
|
|
||||||
private:
|
|
||||||
void init (const ResUse *res);
|
|
||||||
public:
|
|
||||||
FieldNames () {}
|
|
||||||
FieldNames (const ResUse *res) {init(res);}
|
|
||||||
- FieldNames (int i) : vector<string>(i) {}
|
|
||||||
+ FieldNames (int i) : std::vector<std::string>(i) {}
|
|
||||||
|
|
||||||
FieldNames& operator = (const ResUse *res) {init(res); return *this;}
|
|
||||||
//: Creates a new list from the data in res.
|
|
||||||
FieldNames& operator = (int i) {insert(begin(), i, ""); return *this;}
|
|
||||||
//: Creates a new list with i field names.
|
|
||||||
|
|
||||||
- string& operator [] (int i) {return vector<string>::operator [] (i);}
|
|
||||||
+ std::string& operator [] (int i) {return std::vector<std::string>::operator [] (i);}
|
|
||||||
//: returns the field name of the field with that index number
|
|
||||||
|
|
||||||
- const string& operator [] (int i) const
|
|
||||||
- {return vector<string>::operator [] (i);}
|
|
||||||
+ const std::string& operator [] (int i) const
|
|
||||||
+ {return std::vector<std::string>::operator [] (i);}
|
|
||||||
//: returns the field name of the field with that index number
|
|
||||||
|
|
||||||
- uint operator [] (string i) const
|
|
||||||
+ uint operator [] (std::string i) const
|
|
||||||
{
|
|
||||||
- string temp(i); str_to_lwr(temp);
|
|
||||||
+ std::string temp(i); str_to_lwr(temp);
|
|
||||||
return find(begin(),end(), temp) - begin();
|
|
||||||
}
|
|
||||||
//: returns the index number of the field with that name
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_field_names_cc,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/field_names.cc.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/field_names.cc 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -13,7 +13,7 @@ void FieldNames::init(const ResUse *res)
|
|
||||||
int num = res->num_fields();
|
|
||||||
reserve(num);
|
|
||||||
for (int i = 0; i < num; i++) {
|
|
||||||
- string p(res->fields()[i].name); str_to_lwr(p); push_back(p);
|
|
||||||
+ std::string p(res->fields()[i].name); str_to_lwr(p); push_back(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,42 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_field_types1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/field_types1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/field_types1.hh 2004-01-04 23:27:18.000000000 +0100
|
|
||||||
@@ -1,19 +1,21 @@
|
|
||||||
#ifndef __field_types1_hh__
|
|
||||||
#define __field_types1_hh__
|
|
||||||
|
|
||||||
-#include <vector.h>
|
|
||||||
+#include <vector>
|
|
||||||
#include "defs"
|
|
||||||
#include "define_short"
|
|
||||||
#include "type_info1.hh"
|
|
||||||
|
|
||||||
+//using namespace std;
|
|
||||||
+
|
|
||||||
//: A vector of the field types.
|
|
||||||
-class FieldTypes : public vector<mysql_type_info> {
|
|
||||||
+class FieldTypes : public std::vector<mysql_type_info> {
|
|
||||||
private:
|
|
||||||
void init (const ResUse *res);
|
|
||||||
public:
|
|
||||||
FieldTypes () {}
|
|
||||||
FieldTypes (const ResUse *res) {init(res);}
|
|
||||||
- FieldTypes (int i) : vector<mysql_type_info>(i) {}
|
|
||||||
+ FieldTypes (int i) : std::vector<mysql_type_info>(i) {}
|
|
||||||
|
|
||||||
FieldTypes& operator = (const ResUse *res) {init(res); return *this;}
|
|
||||||
//: Creates a new list based on the info in res
|
|
||||||
@@ -21,11 +23,11 @@ public:
|
|
||||||
mysql_type_info()); return *this;}
|
|
||||||
//: Creates a new list with i fields.
|
|
||||||
|
|
||||||
- mysql_type_info& operator [] (int i) {return vector<mysql_type_info>
|
|
||||||
+ mysql_type_info& operator [] (int i) {return std::vector<mysql_type_info>
|
|
||||||
::operator [] (i);}
|
|
||||||
//: Returns the field type for the field with an offset of i.
|
|
||||||
const mysql_type_info& operator [] (int i) const
|
|
||||||
- {return vector<mysql_type_info>::operator[] (i);}
|
|
||||||
+ {return std::vector<mysql_type_info>::operator[] (i);}
|
|
||||||
//: Returns the field type for the field with an offset of i.
|
|
||||||
};
|
|
||||||
|
|
||||||
@ -1,276 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_manip1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/manip1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/manip1.hh 2004-01-04 23:55:26.000000000 +0100
|
|
||||||
@@ -24,11 +24,11 @@ class SQLQueryParms;
|
|
||||||
enum quote_type0 {mysql_quote};
|
|
||||||
|
|
||||||
struct quote_type1 {
|
|
||||||
- ostream *ostr;
|
|
||||||
- quote_type1(ostream *o) : ostr(o) {}
|
|
||||||
+ std::ostream *ostr;
|
|
||||||
+ quote_type1(std::ostream *o) : ostr(o) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
-inline quote_type1 operator << (ostream &o, quote_type0 esc) {
|
|
||||||
+inline quote_type1 operator << (std::ostream &o, quote_type0 esc) {
|
|
||||||
return quote_type1(&o);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -44,52 +44,52 @@ inline quote_type2 operator << (SQLQuery
|
|
||||||
SQLQueryParms& operator << (quote_type2 p, SQLString &in);
|
|
||||||
|
|
||||||
template <class T>
|
|
||||||
-inline ostream& operator << (quote_type1 o, const T &in) {
|
|
||||||
+inline std::ostream& operator << (quote_type1 o, const T &in) {
|
|
||||||
return *o.ostr << in;
|
|
||||||
}
|
|
||||||
|
|
||||||
-ostream& operator << (ostream& o,const mysql_ColData<string>& in);
|
|
||||||
+std::ostream& operator << (std::ostream& o,const mysql_ColData<std::string>& in);
|
|
||||||
|
|
||||||
-ostream& operator << (ostream& o, const mysql_ColData<const_string>& in);
|
|
||||||
+std::ostream& operator << (std::ostream& o, const mysql_ColData<const_string>& in);
|
|
||||||
|
|
||||||
-SQLQuery& operator << (SQLQuery& o, const mysql_ColData<string>& in);
|
|
||||||
+SQLQuery& operator << (SQLQuery& o, const mysql_ColData<std::string>& in);
|
|
||||||
|
|
||||||
SQLQuery& operator << (SQLQuery& o, const mysql_ColData<const_string>& in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (quote_type1 o, const string &in);
|
|
||||||
+std::ostream& operator << (quote_type1 o, const std::string &in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (quote_type1 o, const char* const &in);
|
|
||||||
+std::ostream& operator << (quote_type1 o, const char* const &in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (quote_type1 o, const mysql_ColData<string>& in);
|
|
||||||
+std::ostream& operator << (quote_type1 o, const mysql_ColData<std::string>& in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (quote_type1 o, const mysql_ColData<const_string>& in);
|
|
||||||
+std::ostream& operator << (quote_type1 o, const mysql_ColData<const_string>& in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_type1 o, char* const &in) {
|
|
||||||
+inline std::ostream& operator << (quote_type1 o, char* const &in) {
|
|
||||||
return operator << (o, const_cast<const char* const &>(in));
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_type1 o, const Date &in) {
|
|
||||||
+inline std::ostream& operator << (quote_type1 o, const Date &in) {
|
|
||||||
return *o.ostr << "'" << in << "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_type1 o, const Time &in) {
|
|
||||||
+inline std::ostream& operator << (quote_type1 o, const Time &in) {
|
|
||||||
return *o.ostr << "'" << in << "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_type1 o, const DateTime &in) {
|
|
||||||
+inline std::ostream& operator << (quote_type1 o, const DateTime &in) {
|
|
||||||
return *o.ostr << "'" << in << "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class ST>
|
|
||||||
-inline ostream& operator << (quote_type1 o, const MysqlSet<ST> &in) {
|
|
||||||
+inline std::ostream& operator << (quote_type1 o, const MysqlSet<ST> &in) {
|
|
||||||
return *o.ostr << "'" << in << "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -98,11 +98,11 @@ inline ostream& operator << (quote_type1
|
|
||||||
enum quote_only_type0 {mysql_quote_only};
|
|
||||||
|
|
||||||
struct quote_only_type1 {
|
|
||||||
- ostream *ostr;
|
|
||||||
- quote_only_type1(ostream *o) : ostr(o) {}
|
|
||||||
+ std::ostream *ostr;
|
|
||||||
+ quote_only_type1(std::ostream *o) : ostr(o) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
-inline quote_only_type1 operator << (ostream &o, quote_only_type0 esc) {
|
|
||||||
+inline quote_only_type1 operator << (std::ostream &o, quote_only_type0 esc) {
|
|
||||||
return quote_only_type1(&o);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -118,38 +118,38 @@ inline quote_only_type2 operator << (SQL
|
|
||||||
SQLQueryParms & operator << (quote_only_type2 p, SQLString &in);
|
|
||||||
|
|
||||||
template <class T>
|
|
||||||
-inline ostream& operator << (quote_only_type1 o, const T &in) {
|
|
||||||
+inline std::ostream& operator << (quote_only_type1 o, const T &in) {
|
|
||||||
return *o.ostr << in;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_only_type1 o, const string &in) {
|
|
||||||
+inline std::ostream& operator << (quote_only_type1 o, const std::string &in) {
|
|
||||||
return *o.ostr << "'" << in << "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (quote_only_type1 o, const mysql_ColData<string>& in);
|
|
||||||
+std::ostream& operator << (quote_only_type1 o, const mysql_ColData<std::string>& in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (quote_only_type1 o, const mysql_ColData<const_string>& in);
|
|
||||||
+std::ostream& operator << (quote_only_type1 o, const mysql_ColData<const_string>& in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_only_type1 o, const Date &in) {
|
|
||||||
+inline std::ostream& operator << (quote_only_type1 o, const Date &in) {
|
|
||||||
return *o.ostr << "'" << in << "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_only_type1 o, const Time &in) {
|
|
||||||
+inline std::ostream& operator << (quote_only_type1 o, const Time &in) {
|
|
||||||
return *o.ostr << "'" << in << "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_only_type1 o, const DateTime &in) {
|
|
||||||
+inline std::ostream& operator << (quote_only_type1 o, const DateTime &in) {
|
|
||||||
return *o.ostr << "'" << in << "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class ST>
|
|
||||||
-inline ostream& operator << (quote_only_type1 o, const MysqlSet<ST> &in) {
|
|
||||||
+inline std::ostream& operator << (quote_only_type1 o, const MysqlSet<ST> &in) {
|
|
||||||
return *o.ostr << "'" << in << "'";
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -157,11 +157,11 @@ inline ostream& operator << (quote_only_
|
|
||||||
|
|
||||||
enum quote_double_only_type0 {mysql_quote_double_only};
|
|
||||||
struct quote_double_only_type1 {
|
|
||||||
- ostream *ostr;
|
|
||||||
- quote_double_only_type1(ostream *o) : ostr(o) {}
|
|
||||||
+ std::ostream *ostr;
|
|
||||||
+ quote_double_only_type1(std::ostream *o) : ostr(o) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
-inline quote_double_only_type1 operator << (ostream &o,
|
|
||||||
+inline quote_double_only_type1 operator << (std::ostream &o,
|
|
||||||
quote_double_only_type0 esc) {
|
|
||||||
return quote_double_only_type1(&o);
|
|
||||||
}
|
|
||||||
@@ -179,39 +179,39 @@ inline quote_double_only_type2 operator
|
|
||||||
SQLQueryParms & operator << (quote_double_only_type2 p, SQLString &in);
|
|
||||||
|
|
||||||
template <class T>
|
|
||||||
-inline ostream& operator << (quote_double_only_type1 o, const T &in) {
|
|
||||||
+inline std::ostream& operator << (quote_double_only_type1 o, const T &in) {
|
|
||||||
return *o.ostr << in;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_double_only_type1 o, const string &in) {
|
|
||||||
+inline std::ostream& operator << (quote_double_only_type1 o, const std::string &in) {
|
|
||||||
return *o.ostr << "\"" << in << "\"";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (quote_double_only_type1 o, const mysql_ColData<string>& in);
|
|
||||||
+std::ostream& operator << (quote_double_only_type1 o, const mysql_ColData<std::string>& in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (quote_double_only_type1 o, const mysql_ColData<const_string>& in);
|
|
||||||
+std::ostream& operator << (quote_double_only_type1 o, const mysql_ColData<const_string>& in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_double_only_type1 o, const Date &in) {
|
|
||||||
+inline std::ostream& operator << (quote_double_only_type1 o, const Date &in) {
|
|
||||||
return *o.ostr << "\"" << in << "\"";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_double_only_type1 o, const Time &in) {
|
|
||||||
+inline std::ostream& operator << (quote_double_only_type1 o, const Time &in) {
|
|
||||||
return *o.ostr << "\"" << in << "\"";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (quote_double_only_type1 o,
|
|
||||||
+inline std::ostream& operator << (quote_double_only_type1 o,
|
|
||||||
const DateTime &in) {
|
|
||||||
return *o.ostr << "\"" << in << "\"";
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class ST>
|
|
||||||
-inline ostream& operator << (quote_double_only_type1 o,
|
|
||||||
+inline std::ostream& operator << (quote_double_only_type1 o,
|
|
||||||
const MysqlSet<ST> &in) {
|
|
||||||
return *o.ostr << "\"" << in << "\"";
|
|
||||||
}
|
|
||||||
@@ -220,11 +220,11 @@ inline ostream& operator << (quote_doubl
|
|
||||||
|
|
||||||
enum escape_type0 {mysql_escape};
|
|
||||||
struct escape_type1 {
|
|
||||||
- ostream *ostr;
|
|
||||||
- escape_type1(ostream *o) : ostr(o) {}
|
|
||||||
+ std::ostream *ostr;
|
|
||||||
+ escape_type1(std::ostream *o) : ostr(o) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
-inline escape_type1 operator << (ostream &o, escape_type0 esc) {
|
|
||||||
+inline escape_type1 operator << (std::ostream &o, escape_type0 esc) {
|
|
||||||
return escape_type1(&o);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -240,24 +240,24 @@ inline escape_type2 operator << (SQLQuer
|
|
||||||
SQLQueryParms & operator << (escape_type2 p, SQLString &in);
|
|
||||||
|
|
||||||
template <class T>
|
|
||||||
-inline ostream& operator << (escape_type1 o, const T &in) {
|
|
||||||
+inline std::ostream& operator << (escape_type1 o, const T &in) {
|
|
||||||
return *o.ostr << in;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (escape_type1 o, const string &in);
|
|
||||||
+std::ostream& operator << (escape_type1 o, const std::string &in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (escape_type1 o, const char* const &in);
|
|
||||||
+std::ostream& operator << (escape_type1 o, const char* const &in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (escape_type1 o, const mysql_ColData<string>& in);
|
|
||||||
+std::ostream& operator << (escape_type1 o, const mysql_ColData<std::string>& in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-ostream& operator << (escape_type1 o, const mysql_ColData<const_string>& in);
|
|
||||||
+std::ostream& operator << (escape_type1 o, const mysql_ColData<const_string>& in);
|
|
||||||
|
|
||||||
template <>
|
|
||||||
-inline ostream& operator << (escape_type1 o, char* const &in) {
|
|
||||||
+inline std::ostream& operator << (escape_type1 o, char* const &in) {
|
|
||||||
return operator << (o, const_cast<const char* const &>(in));
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -266,16 +266,16 @@ inline ostream& operator << (escape_type
|
|
||||||
|
|
||||||
enum do_nothing_type0 {mysql_do_nothing};
|
|
||||||
struct do_nothing_type1 {
|
|
||||||
- ostream *ostr;
|
|
||||||
- do_nothing_type1(ostream *o) : ostr(o) {}
|
|
||||||
+ std::ostream *ostr;
|
|
||||||
+ do_nothing_type1(std::ostream *o) : ostr(o) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
-inline do_nothing_type1 operator << (ostream &o, do_nothing_type0 esc) {
|
|
||||||
+inline do_nothing_type1 operator << (std::ostream &o, do_nothing_type0 esc) {
|
|
||||||
return do_nothing_type1(&o);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class T>
|
|
||||||
-inline ostream& operator << (do_nothing_type1 o, const T &in) {
|
|
||||||
+inline std::ostream& operator << (do_nothing_type1 o, const T &in) {
|
|
||||||
return *o.ostr << in;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_manip_cc,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/manip.cc.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/manip.cc 2004-01-05 00:04:07.000000000 +0100
|
|
||||||
@@ -1,6 +1,8 @@
|
|
||||||
|
|
||||||
#include "manip3.hh"
|
|
||||||
|
|
||||||
+using namespace std;
|
|
||||||
+
|
|
||||||
// quote manipulator
|
|
||||||
|
|
||||||
bool dont_quote_auto=false;
|
|
||||||
@@ -75,7 +77,7 @@ ostream& operator << (quote_type1 o, con
|
|
||||||
}
|
|
||||||
|
|
||||||
ostream& operator << (ostream& o, const mysql_ColData<string>& in) {
|
|
||||||
- if (dont_quote_auto || (o.rdbuf() == cout.rdbuf()) || (o.rdbuf() == cerr.rdbuf())) return o << in.get_string();
|
|
||||||
+ if (dont_quote_auto || (o.rdbuf() == std::cout.rdbuf()) || (o.rdbuf() == std::cerr.rdbuf())) return o << in.get_string();
|
|
||||||
if (in.escape_q()) {
|
|
||||||
char *s = new char[in.size()*2+1];
|
|
||||||
mysql_escape_string(s, const_cast<char *>(in.c_str()), in.size() );
|
|
||||||
@@ -94,7 +96,7 @@ ostream& operator << (ostream& o, const
|
|
||||||
|
|
||||||
|
|
||||||
ostream& operator << (ostream& o, const mysql_ColData<const_string>& in) {
|
|
||||||
- if (dont_quote_auto || (o.rdbuf() == cout.rdbuf()) || (o.rdbuf() == cerr.rdbuf())) return o << in.get_string();
|
|
||||||
+ if (dont_quote_auto || (o.rdbuf() == std::cout.rdbuf()) || (o.rdbuf() == std::cerr.rdbuf())) return o << in.get_string();
|
|
||||||
if (in.escape_q()) {
|
|
||||||
char *s = new char[in.size()*2+1];
|
|
||||||
mysql_escape_string(s, const_cast<char *>(in.c_str()), in.size() );
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_null1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/null1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/null1.hh 2004-01-04 23:26:25.000000000 +0100
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
#ifndef __null1_hh__
|
|
||||||
#define __null1_hh__
|
|
||||||
|
|
||||||
-#include <ostream.h>
|
|
||||||
+#include <iostream>
|
|
||||||
#include "exceptions.hh"
|
|
||||||
#include "define_short"
|
|
||||||
|
|
||||||
@@ -18,19 +18,19 @@ const null_type null = null_type();
|
|
||||||
//: Type to use for the behavior parameter for *Null<>*
|
|
||||||
struct NullisNull {
|
|
||||||
static null_type null_is() {return null_type();}
|
|
||||||
- static ostream& null_ostr(ostream& o) {o << "(NULL)"; return o;}
|
|
||||||
+ static std::ostream& null_ostr(std::ostream& o) {o << "(NULL)"; return o;}
|
|
||||||
};
|
|
||||||
|
|
||||||
//: Type to use for the behavior parameter for *Null<>*
|
|
||||||
struct NullisZero {
|
|
||||||
static int null_is() {return 0;}
|
|
||||||
- static ostream& null_ostr(ostream &o) {o << 0; return o;}
|
|
||||||
+ static std::ostream& null_ostr(std::ostream &o) {o << 0; return o;}
|
|
||||||
};
|
|
||||||
|
|
||||||
//: Type to use for the behavior parameter for *Null<>*
|
|
||||||
struct NullisBlank {
|
|
||||||
static const char * null_is() {return "";}
|
|
||||||
- static ostream& null_ostr(ostream &o) {o << ""; return o;}
|
|
||||||
+ static std::ostream& null_ostr(std::ostream &o) {o << ""; return o;}
|
|
||||||
};
|
|
||||||
|
|
||||||
//: Container class for holding null types.
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_null2_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/null2.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/null2.hh 2004-01-04 23:26:25.000000000 +0100
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
#include "null1.hh"
|
|
||||||
|
|
||||||
template <class Type, class Behavior>
|
|
||||||
-inline ostream& operator << (ostream &o, const Null<Type,Behavior> &n) {
|
|
||||||
+inline std::ostream& operator << (std::ostream &o, const Null<Type,Behavior> &n) {
|
|
||||||
if (n.is_null) return Behavior::null_ostr(o);
|
|
||||||
else return o << n.data;
|
|
||||||
}
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_query1_hh,v 1.2 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/query1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/query1.hh 2004-01-04 23:31:02.000000000 +0100
|
|
||||||
@@ -25,24 +25,24 @@ private:
|
|
||||||
|
|
||||||
int affected_rows() const;
|
|
||||||
int insert_id ();
|
|
||||||
- string info ();
|
|
||||||
+ std::string info ();
|
|
||||||
bool lock();
|
|
||||||
void unlock();
|
|
||||||
|
|
||||||
public:
|
|
||||||
Query(Connection *m, bool te = false)
|
|
||||||
- {mysql = m;errmsg=NULL;Success = true;throw_exceptions=te;}
|
|
||||||
+ {mysql = m;errmsg=NULL;Success_ = true;throw_exceptions=te;}
|
|
||||||
//: Create a new query object attached to a connection.
|
|
||||||
Query(const Query &q); //:
|
|
||||||
Query& operator = (const Query &q); //:
|
|
||||||
|
|
||||||
- string error (); //: The error message if the query was not successful.
|
|
||||||
+ std::string error (); //: The error message if the query was not successful.
|
|
||||||
bool success(); //: Displays the string currently in the buffer.
|
|
||||||
// Same thing as string().
|
|
||||||
|
|
||||||
- string preview () {return str(def);} //:
|
|
||||||
- string preview (parms &p) {return str(p);} //:
|
|
||||||
- bool exec (const string &str);
|
|
||||||
+ std::string preview () {return str(def);} //:
|
|
||||||
+ std::string preview (parms &p) {return str(p);} //:
|
|
||||||
+ bool exec (const std::string &str);
|
|
||||||
//!dummy: MysqlResNSel execute (...);
|
|
||||||
//: Executes the query in the string buffer.
|
|
||||||
// Executes the query in the string buffer and returns a structure
|
|
||||||
@@ -67,7 +67,7 @@ public:
|
|
||||||
//
|
|
||||||
// The parameters can be anything in a valid SQLQuery::str.
|
|
||||||
|
|
||||||
- mysql_query_define0(string,preview)
|
|
||||||
+ mysql_query_define0(std::string,preview)
|
|
||||||
|
|
||||||
mysql_query_define1(ResNSel, execute)
|
|
||||||
mysql_query_define1(ResUse, use)
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_query2_hh,v 1.2 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/query2.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/query2.hh 2004-01-04 23:31:06.000000000 +0100
|
|
||||||
@@ -7,7 +7,7 @@
|
|
||||||
#include "coldata2.hh"
|
|
||||||
|
|
||||||
inline bool Query::success() {
|
|
||||||
- if (!Success) return false;
|
|
||||||
+ if (!Success_) return false;
|
|
||||||
return mysql->success();
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -47,12 +47,12 @@ inline int Query::insert_id () {
|
|
||||||
return mysql->insert_id();
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline string Query::info() {
|
|
||||||
+inline std::string Query::info() {
|
|
||||||
return mysql->info();
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline string Query::error () {
|
|
||||||
- if (errmsg) return string(errmsg);
|
|
||||||
+inline std::string Query::error () {
|
|
||||||
+ if (errmsg) return std::string(errmsg);
|
|
||||||
return mysql->error();
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_query_cc,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/query.cc.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/query.cc 2004-01-05 00:04:31.000000000 +0100
|
|
||||||
@@ -1,5 +1,8 @@
|
|
||||||
|
|
||||||
#include "query3.hh"
|
|
||||||
+#include "row2.hh"
|
|
||||||
+
|
|
||||||
+using namespace std;
|
|
||||||
|
|
||||||
MysqlQuery::MysqlQuery(const MysqlQuery &q) : SQLQuery(q) {
|
|
||||||
throw_exceptions = q.throw_exceptions;
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_resiter1_hh,v 1.2 2004/12/14 17:40:44 espie Exp $
|
|
||||||
--- sqlplusint/resiter1.hh.orig Sat May 19 18:44:48 2001
|
|
||||||
+++ sqlplusint/resiter1.hh Tue Dec 14 18:30:58 2004
|
|
||||||
@@ -3,7 +3,7 @@
|
|
||||||
|
|
||||||
#include "defs"
|
|
||||||
#include "row1.hh"
|
|
||||||
-#include <iterator.h>
|
|
||||||
+#include <iterator>
|
|
||||||
|
|
||||||
template <class OnType, class ReturnType, class SizeType, class DiffType>
|
|
||||||
class subscript_iterator;
|
|
||||||
@@ -22,8 +22,8 @@ public:
|
|
||||||
typedef subscript_iterator<const this_type, ReturnType, SizeType, DiffType>
|
|
||||||
iterator; //:
|
|
||||||
typedef iterator const_iterator; //:
|
|
||||||
- typedef const ::reverse_iterator<iterator> reverse_iterator; //:
|
|
||||||
- typedef const ::reverse_iterator<const_iterator> const_reverse_iterator; //:
|
|
||||||
+ typedef const std::reverse_iterator<iterator> reverse_iterator; //:
|
|
||||||
+ typedef const std::reverse_iterator<const_iterator> const_reverse_iterator; //:
|
|
||||||
|
|
||||||
typedef ValueType value_type; //:
|
|
||||||
typedef value_type& reference; //:
|
|
||||||
@@ -46,6 +46,17 @@ public:
|
|
||||||
reverse_iterator rbegin() const {return reverse_iterator(end());} //:
|
|
||||||
reverse_iterator rend() const {return reverse_iterator(begin());} //:
|
|
||||||
};
|
|
||||||
+
|
|
||||||
+#if __GNUC__ > 2
|
|
||||||
+template<typename _Tp, typename _Distance>
|
|
||||||
+ struct random_access_iterator {
|
|
||||||
+ typedef std::random_access_iterator_tag iterator_category;
|
|
||||||
+ typedef _Tp value_type;
|
|
||||||
+ typedef _Distance difference_type;
|
|
||||||
+ typedef _Tp* pointer;
|
|
||||||
+ typedef _Tp& reference;
|
|
||||||
+ };
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
//:
|
|
||||||
template <class OnType, class ReturnType, class SizeType, class DiffType>
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_result1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/result1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/result1.hh 2004-01-04 23:56:43.000000000 +0100
|
|
||||||
@@ -7,8 +7,8 @@
|
|
||||||
#include <winsock.h>
|
|
||||||
#define errno WSAGetLastError()
|
|
||||||
#endif
|
|
||||||
-#include <map.h>
|
|
||||||
-#include <set.h>
|
|
||||||
+#include <map>
|
|
||||||
+#include <set>
|
|
||||||
#include <mysql.h>
|
|
||||||
#include <string>
|
|
||||||
#include "define_short"
|
|
||||||
@@ -20,7 +20,7 @@
|
|
||||||
#include "exceptions.hh"
|
|
||||||
//:
|
|
||||||
class ResUse {
|
|
||||||
- friend Connection;
|
|
||||||
+ friend class Connection;
|
|
||||||
protected:
|
|
||||||
Connection *mysql;
|
|
||||||
mutable MYSQL_RES *mysql_res;
|
|
||||||
@@ -28,7 +28,7 @@ protected:
|
|
||||||
mutable FieldNames *_names;
|
|
||||||
mutable FieldTypes *_types;
|
|
||||||
Fields _fields;
|
|
||||||
- string _table;
|
|
||||||
+ std::string _table;
|
|
||||||
void copy(const ResUse& other); //: not to be used on the self. self - copy is not allowed
|
|
||||||
public:
|
|
||||||
ResUse () : mysql(0), mysql_res(0), throw_exceptions(false),initialized(false), _names(NULL), _types(NULL), _fields(this) {}
|
|
||||||
@@ -72,17 +72,17 @@ public:
|
|
||||||
operator bool() const {if (mysql_res) return true; return false;} //:
|
|
||||||
unsigned int columns() const {return num_fields();} //:
|
|
||||||
|
|
||||||
- string& table() {return _table;}
|
|
||||||
+ std::string& table() {return _table;}
|
|
||||||
//: table name
|
|
||||||
- const string& table() const {return _table;}
|
|
||||||
+ const std::string& table() const {return _table;}
|
|
||||||
//: table name
|
|
||||||
|
|
||||||
/* methods for working with field names */
|
|
||||||
- inline int field_num(const string&) const;
|
|
||||||
+ inline int field_num(const std::string&) const;
|
|
||||||
//: Returns the offset of the filed which equals str.
|
|
||||||
- inline string& field_name(int);
|
|
||||||
+ inline std::string& field_name(int);
|
|
||||||
//: Returns the field with an offset of i.
|
|
||||||
- inline const string& field_name(int) const;
|
|
||||||
+ inline const std::string&field_name(int) const;
|
|
||||||
//: Returns the field with an offset of i.
|
|
||||||
inline FieldNames& field_names();
|
|
||||||
//: Returns a reference to the underlying FieldNames class.
|
|
||||||
@@ -104,11 +104,11 @@ public:
|
|
||||||
//: Resets the field_types to their original values.
|
|
||||||
|
|
||||||
/* short names for the above methods */
|
|
||||||
- inline int names(const string& s) const;
|
|
||||||
+ inline int names(const std::string& s) const;
|
|
||||||
//: Returns the offset of the filed which equals str.
|
|
||||||
- inline string& names(int i);
|
|
||||||
+ inline std::string& names(int i);
|
|
||||||
//: Returns the field with an offset of i.
|
|
||||||
- inline const string& names(int i) const;
|
|
||||||
+ inline const std::string&names(int i) const;
|
|
||||||
//: Returns the field with an offset of i.
|
|
||||||
inline FieldNames& names();
|
|
||||||
//: Returns a reference to the underlying FieldNames class.
|
|
||||||
@@ -151,7 +151,7 @@ public:
|
|
||||||
class Result : public ResUse,
|
|
||||||
public const_subscript_container<Result,Row,const Row>
|
|
||||||
{
|
|
||||||
- friend Connection;
|
|
||||||
+ friend class Connection;
|
|
||||||
public:
|
|
||||||
Result () {} //:
|
|
||||||
Result (MYSQL_RES *result, bool te = false)
|
|
||||||
@@ -210,7 +210,7 @@ struct ResNSel {
|
|
||||||
bool success;
|
|
||||||
int insert_id; //:
|
|
||||||
int rows; //: Number of rows affected
|
|
||||||
- string info; //: Additional info
|
|
||||||
+ std::string info; //: Additional info
|
|
||||||
|
|
||||||
ResNSel() : success(false) {};
|
|
||||||
ResNSel (Connection *q);
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_result2_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/result2.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/result2.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -8,17 +8,17 @@
|
|
||||||
|
|
||||||
// field name info
|
|
||||||
|
|
||||||
-inline int ResUse::field_num(const string &i) const {
|
|
||||||
+inline int ResUse::field_num(const std::string &i) const {
|
|
||||||
if (!_names) _names = new FieldNames(this);
|
|
||||||
return (*_names)[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline string& ResUse::field_name(int i) {
|
|
||||||
+inline std::string& ResUse::field_name(int i) {
|
|
||||||
if (!_names) _names = new FieldNames(this);
|
|
||||||
return (*_names)[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline const string& ResUse::field_name(int i) const {
|
|
||||||
+inline const std::string& ResUse::field_name(int i) const {
|
|
||||||
if (!_names) _names = new FieldNames(this);
|
|
||||||
return (*_names)[i];
|
|
||||||
}
|
|
||||||
@@ -65,9 +65,9 @@ inline void ResUse::reset_field_types()
|
|
||||||
_types = new FieldTypes(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline int ResUse::names(const string& s) const {return field_num(s);}
|
|
||||||
-inline string& ResUse::names(int i) {return field_name(i);}
|
|
||||||
-inline const string& ResUse::names(int i) const {return field_name(i);}
|
|
||||||
+inline int ResUse::names(const std::string& s) const {return field_num(s);}
|
|
||||||
+inline std::string& ResUse::names(int i) {return field_name(i);}
|
|
||||||
+inline const std::string& ResUse::names(int i) const {return field_name(i);}
|
|
||||||
inline FieldNames& ResUse::names() {return field_names();}
|
|
||||||
inline const FieldNames& ResUse::names() const {return field_names();}
|
|
||||||
inline void ResUse::reset_names() {reset_field_names();}
|
|
||||||
@ -1,220 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_row1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/row1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/row1.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -35,17 +35,17 @@ public:
|
|
||||||
|
|
||||||
template <class Manip>
|
|
||||||
value_list_b<ThisType,Manip>
|
|
||||||
- value_list(const char *d, Manip m, const vector<bool> &vb) const {
|
|
||||||
+ value_list(const char *d, Manip m, const std::vector<bool> &vb) const {
|
|
||||||
return value_list_b<ThisType,Manip> (self(), vb, d, m);
|
|
||||||
}
|
|
||||||
|
|
||||||
value_list_b<ThisType,quote_type0>
|
|
||||||
- value_list(const char *d, const vector<bool> &vb) const {
|
|
||||||
+ value_list(const char *d, const std::vector<bool> &vb) const {
|
|
||||||
return value_list_b<ThisType,quote_type0> (self(), vb, d, quote);
|
|
||||||
}
|
|
||||||
|
|
||||||
value_list_b<ThisType,quote_type0>
|
|
||||||
- value_list(const vector<bool> &vb) const {
|
|
||||||
+ value_list(const std::vector<bool> &vb) const {
|
|
||||||
return value_list_b<ThisType,quote_type0> (self(), vb, ",", quote);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -55,7 +55,7 @@ public:
|
|
||||||
bool t1=false, bool t2=false, bool t3=false, bool t4=false,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false) const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(self().size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return value_list_b<ThisType, Manip>(self(), vb, d, m);
|
|
||||||
}
|
|
||||||
@@ -65,7 +65,7 @@ public:
|
|
||||||
bool t1=false, bool t2=false, bool t3=false, bool t4=false,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false) const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(self().size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return value_list_b<ThisType, quote_type0>(self(), vb, d, quote);
|
|
||||||
}
|
|
||||||
@@ -75,38 +75,38 @@ public:
|
|
||||||
bool t1=false, bool t2=false, bool t3=false, bool t4=false,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false) const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(self().size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return value_list_b<ThisType, quote_type0>(self(), vb, ",", quote);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Manip>
|
|
||||||
value_list_b<ThisType,Manip>
|
|
||||||
- value_list(const char *d, Manip m, string s0,
|
|
||||||
- string s1="", string s2="", string s3="", string s4="",
|
|
||||||
- string s5="", string s6="", string s7="", string s8="",
|
|
||||||
- string s9="", string sa="", string sb="", string sc="") const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ value_list(const char *d, Manip m, std::string s0,
|
|
||||||
+ std::string s1="", std::string s2="", std::string s3="", std::string s4="",
|
|
||||||
+ std::string s5="", std::string s6="", std::string s7="", std::string s8="",
|
|
||||||
+ std::string s9="", std::string sa="", std::string sb="", std::string sc="") const {
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(self(), vb, s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,sa,sb,sc);
|
|
||||||
return value_list_b<ThisType, Manip>(self(), vb, d, m);
|
|
||||||
}
|
|
||||||
|
|
||||||
value_list_b<ThisType,quote_type0>
|
|
||||||
- value_list(const char *d, string s0,
|
|
||||||
- string s1="", string s2="", string s3="", string s4="",
|
|
||||||
- string s5="", string s6="", string s7="", string s8="",
|
|
||||||
- string s9="", string sa="", string sb="", string sc="") const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ value_list(const char *d, std::string s0,
|
|
||||||
+ std::string s1="", std::string s2="", std::string s3="", std::string s4="",
|
|
||||||
+ std::string s5="", std::string s6="", std::string s7="", std::string s8="",
|
|
||||||
+ std::string s9="", std::string sa="", std::string sb="", std::string sc="") const {
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(self(), vb, s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,sa,sb,sc);
|
|
||||||
return value_list_b<ThisType, quote_type0>(self(), vb, d, quote);
|
|
||||||
}
|
|
||||||
|
|
||||||
value_list_b<ThisType,quote_type0>
|
|
||||||
- value_list(string s0,
|
|
||||||
- string s1="", string s2="", string s3="", string s4="",
|
|
||||||
- string s5="", string s6="", string s7="", string s8="",
|
|
||||||
- string s9="", string sa="", string sb="", string sc="") const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ value_list(std::string s0,
|
|
||||||
+ std::string s1="", std::string s2="", std::string s3="", std::string s4="",
|
|
||||||
+ std::string s5="", std::string s6="", std::string s7="", std::string s8="",
|
|
||||||
+ std::string s9="", std::string sa="", std::string sb="", std::string sc="") const {
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(self(), vb, s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,sa,sb,sc);
|
|
||||||
return value_list_b<ThisType, quote_type0>(self(), vb, ",", quote);
|
|
||||||
}
|
|
||||||
@@ -129,17 +129,17 @@ public:
|
|
||||||
|
|
||||||
template <class Manip>
|
|
||||||
value_list_b<FieldNames,Manip>
|
|
||||||
- field_list(const char *d, Manip m, const vector<bool> &vb) const {
|
|
||||||
+ field_list(const char *d, Manip m, const std::vector<bool> &vb) const {
|
|
||||||
return value_list_b<FieldNames,Manip> (parent().names(), vb, d, m);
|
|
||||||
}
|
|
||||||
|
|
||||||
value_list_b<FieldNames,quote_type0>
|
|
||||||
- field_list(const char *d, const vector<bool> &vb) const {
|
|
||||||
+ field_list(const char *d, const std::vector<bool> &vb) const {
|
|
||||||
return value_list_b<FieldNames,quote_type0> (parent().names(), vb, d, quote);
|
|
||||||
}
|
|
||||||
|
|
||||||
value_list_b<FieldNames,quote_type0>
|
|
||||||
- field_list(const vector<bool> &vb) const {
|
|
||||||
+ field_list(const std::vector<bool> &vb) const {
|
|
||||||
return value_list_b<FieldNames,quote_type0> (parent().names(), vb, ",", quote);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -149,7 +149,7 @@ public:
|
|
||||||
bool t1=false, bool t2=false, bool t3=false, bool t4=false,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false) const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(parent().names().size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return value_list_b<FieldNames, Manip>(parent().names(), vb, d, m);
|
|
||||||
}
|
|
||||||
@@ -159,7 +159,7 @@ public:
|
|
||||||
bool t1=false, bool t2=false, bool t3=false, bool t4=false,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false) const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(parent().names().size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return value_list_b<FieldNames, quote_type0>(parent().names(), vb, d, quote);
|
|
||||||
}
|
|
||||||
@@ -169,38 +169,38 @@ public:
|
|
||||||
bool t1=false, bool t2=false, bool t3=false, bool t4=false,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false) const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(parent().names().size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return value_list_b<FieldNames, quote_type0>(parent().names(), vb, ",", quote);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Manip>
|
|
||||||
value_list_b<FieldNames,Manip>
|
|
||||||
- field_list(const char *d, Manip m, string s0,
|
|
||||||
- string s1="", string s2="", string s3="", string s4="",
|
|
||||||
- string s5="", string s6="", string s7="", string s8="",
|
|
||||||
- string s9="", string sa="", string sb="", string sc="") const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ field_list(const char *d, Manip m, std::string s0,
|
|
||||||
+ std::string s1="", std::string s2="", std::string s3="", std::string s4="",
|
|
||||||
+ std::string s5="", std::string s6="", std::string s7="", std::string s8="",
|
|
||||||
+ std::string s9="", std::string sa="", std::string sb="", std::string sc="") const {
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(parent().names(), vb, s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,sa,sb,sc);
|
|
||||||
return value_list_b<FieldNames, Manip>(parent().names(), vb, d, m);
|
|
||||||
}
|
|
||||||
|
|
||||||
value_list_b<FieldNames,quote_type0>
|
|
||||||
- field_list(const char *d, string s0,
|
|
||||||
- string s1="", string s2="", string s3="", string s4="",
|
|
||||||
- string s5="", string s6="", string s7="", string s8="",
|
|
||||||
- string s9="", string sa="", string sb="", string sc="") const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ field_list(const char *d, std::string s0,
|
|
||||||
+ std::string s1="", std::string s2="", std::string s3="", std::string s4="",
|
|
||||||
+ std::string s5="", std::string s6="", std::string s7="", std::string s8="",
|
|
||||||
+ std::string s9="", std::string sa="", std::string sb="", std::string sc="") const {
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(parent().names(), vb, s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,sa,sb,sc);
|
|
||||||
return value_list_b<FieldNames, quote_type0>(parent().names(), vb, d, quote);
|
|
||||||
}
|
|
||||||
|
|
||||||
value_list_b<FieldNames,quote_type0>
|
|
||||||
- field_list(string s0,
|
|
||||||
- string s1="", string s2="", string s3="", string s4="",
|
|
||||||
- string s5="", string s6="", string s7="", string s8="",
|
|
||||||
- string s9="", string sa="", string sb="", string sc="") const {
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ field_list(std::string s0,
|
|
||||||
+ std::string s1="", std::string s2="", std::string s3="", std::string s4="",
|
|
||||||
+ std::string s5="", std::string s6="", std::string s7="", std::string s8="",
|
|
||||||
+ std::string s9="", std::string sa="", std::string sb="", std::string sc="") const {
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(parent().names(), vb, s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,sa,sb,sc);
|
|
||||||
return value_list_b<FieldNames, quote_type0>(parent().names(), vb, ",", quote);
|
|
||||||
}
|
|
||||||
@@ -229,8 +229,8 @@ class Row : public const_subscript_conta
|
|
||||||
public RowTemplate<Row, ResUse>
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
- vector <string> data;
|
|
||||||
- vector <bool> is_nulls;
|
|
||||||
+ std::vector <std::string> data;
|
|
||||||
+ std::vector <bool> is_nulls;
|
|
||||||
const ResUse *res;
|
|
||||||
bool throw_exceptions, initialized;
|
|
||||||
|
|
||||||
@@ -246,7 +246,7 @@ public:
|
|
||||||
data.clear(); is_nulls.clear(); initialized=true;
|
|
||||||
for (unsigned int i=0;i<size();i++)
|
|
||||||
{
|
|
||||||
- data.insert(data.end(),(d[i]) ? string(d[i],jj[i]) : (string)"NULL");
|
|
||||||
+ data.insert(data.end(),(d[i]) ? std::string(d[i],jj[i]) : (std::string)"NULL");
|
|
||||||
is_nulls.insert(is_nulls.end(),d[i] ? false : true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -268,7 +268,7 @@ public:
|
|
||||||
inline const ColData operator [] (const char *) const;
|
|
||||||
//: Returns the value of the field with the field name of i.
|
|
||||||
// This method is not nearly as efficient as using the index number. Use sparingly.
|
|
||||||
- inline const ColData operator [] (const string &i) const;
|
|
||||||
+ inline const ColData operator [] (const std::string &i) const;
|
|
||||||
//: Returns the value of the field with the field name of i.
|
|
||||||
// This method is not nearly as effecent as using the index number. Use sparingly.
|
|
||||||
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_row2_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/row2.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/row2.hh 2004-01-05 00:01:20.000000000 +0100
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
#ifndef __row2_hh__
|
|
||||||
#define __row2_hh__
|
|
||||||
|
|
||||||
-#include "string.h"
|
|
||||||
+#include <string>
|
|
||||||
#include "row1.hh"
|
|
||||||
#include "result2.hh"
|
|
||||||
|
|
||||||
@@ -11,12 +11,12 @@ inline const ColData Row::operator [] (s
|
|
||||||
return ColData(data[i].c_str(), res->types(i),is_nulls[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline const ColData Row::operator[] (const string &i) const {
|
|
||||||
+inline const ColData Row::operator[] (const std::string &i) const {
|
|
||||||
return (*this)[res->field_num(i)];
|
|
||||||
}
|
|
||||||
|
|
||||||
inline const ColData Row::operator[] (const char *i) const {
|
|
||||||
- return (*this)[res->field_num(string(i))];
|
|
||||||
+ return (*this)[res->field_num(std::string(i))];
|
|
||||||
}
|
|
||||||
|
|
||||||
// RowTemplate
|
|
||||||
@ -1,59 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_set1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/set1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/set1.hh 2004-01-04 23:54:00.000000000 +0100
|
|
||||||
@@ -9,7 +9,7 @@
|
|
||||||
#endif
|
|
||||||
#include <set>
|
|
||||||
#include <vector>
|
|
||||||
-#include <iostream.h>
|
|
||||||
+#include <iostream>
|
|
||||||
#include "define_short"
|
|
||||||
#include "coldata1.hh"
|
|
||||||
|
|
||||||
@@ -32,37 +32,37 @@ public:
|
|
||||||
};
|
|
||||||
|
|
||||||
template <class T>
|
|
||||||
-inline MysqlSetInsert<set<T> > set_insert(set<T> *o) {
|
|
||||||
- return MysqlSetInsert<set<T> >(o);
|
|
||||||
+inline MysqlSetInsert<std::set<T> > set_insert(std::set<T> *o) {
|
|
||||||
+ return MysqlSetInsert<std::set<T> >(o);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class T>
|
|
||||||
-inline MysqlListInsert<vector<T> > set_insert(vector<T> *o) {
|
|
||||||
- return MysqlListInsert<vector<T> >(o);
|
|
||||||
+inline MysqlListInsert<std::vector<T> > set_insert(std::vector<T> *o) {
|
|
||||||
+ return MysqlListInsert<std::vector<T> >(o);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Insert>
|
|
||||||
void set2container (const char *str, Insert insert);
|
|
||||||
|
|
||||||
//: A Special Set for holding mysql sets.
|
|
||||||
-template <class Container = set<string> >
|
|
||||||
+template <class Container = std::set<std::string> >
|
|
||||||
class Set : public Container {
|
|
||||||
public:
|
|
||||||
Set(const char* str) {set2container(str,set_insert(this));} //:
|
|
||||||
- Set(const string &str) {set2container(str.c_str(),set_insert(this));} //:
|
|
||||||
+ Set(const std::string &str) {set2container(str.c_str(),set_insert(this));} //:
|
|
||||||
Set(const ColData &str)
|
|
||||||
{set2container(str.c_str(),set_insert(this));} //:
|
|
||||||
|
|
||||||
- ostream& out_stream(ostream &s) const;
|
|
||||||
+ std::ostream& out_stream(std::ostream &s) const;
|
|
||||||
|
|
||||||
- operator string ();
|
|
||||||
+ operator std::string ();
|
|
||||||
};
|
|
||||||
|
|
||||||
//! with_class = Set
|
|
||||||
|
|
||||||
//:
|
|
||||||
template <class Container>
|
|
||||||
-inline ostream& operator << (ostream &s, const Set<Container> &d)
|
|
||||||
+inline std::ostream& operator << (std::ostream &s, const Set<Container> &d)
|
|
||||||
{
|
|
||||||
return d.out_stream(s);
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_set2_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/set2.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/set2.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -5,8 +5,8 @@
|
|
||||||
#include "stream2string3.hh"
|
|
||||||
|
|
||||||
template <class Container>
|
|
||||||
-inline Set<Container>::operator string () {
|
|
||||||
- return stream2string<string>(*this);
|
|
||||||
+inline Set<Container>::operator std::string () {
|
|
||||||
+ return stream2string<std::string>(*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_set3_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/set3.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/set3.hh 2004-01-05 00:10:07.000000000 +0100
|
|
||||||
@@ -6,9 +6,8 @@
|
|
||||||
|
|
||||||
template <class Insert>
|
|
||||||
void set2container (const char *str, Insert insert) {
|
|
||||||
- MutableColData s(false);
|
|
||||||
while (1) {
|
|
||||||
- s = "";
|
|
||||||
+ MutableColData s(false);
|
|
||||||
while (*str != ',' && *str) {
|
|
||||||
s += *str;
|
|
||||||
str++;
|
|
||||||
@@ -20,7 +19,7 @@ void set2container (const char *str, Ins
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Container>
|
|
||||||
-ostream& Set<Container>::out_stream (ostream &s) const {
|
|
||||||
+std::ostream& Set<Container>::out_stream (std::ostream &s) const {
|
|
||||||
typename Container::const_iterator i = begin();
|
|
||||||
typename Container::const_iterator e = end();
|
|
||||||
while (true) {
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_set_cc,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/set.cc.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/set.cc 2004-01-05 00:08:39.000000000 +0100
|
|
||||||
@@ -1,4 +1,6 @@
|
|
||||||
|
|
||||||
#include "set3.hh"
|
|
||||||
|
|
||||||
+using namespace std;
|
|
||||||
+
|
|
||||||
template class Set<set<string> >;
|
|
||||||
@ -1,105 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_sql_query1_hh,v 1.2 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/sql_query1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/sql_query1.hh 2004-01-04 23:50:11.000000000 +0100
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
#ifndef __sql_query_1_hh
|
|
||||||
#define __sql_query_1_hh
|
|
||||||
|
|
||||||
-#include <strstream.h>
|
|
||||||
+#include <sstream>
|
|
||||||
#include <vector>
|
|
||||||
#include <map>
|
|
||||||
#include "define_short"
|
|
||||||
@@ -16,8 +16,8 @@ class SQLQuery;
|
|
||||||
|
|
||||||
//: This class holds the parameter values for filling template queries.
|
|
||||||
// It is a subclass of a vector of *SQLStrings*.
|
|
||||||
-class SQLQueryParms : public vector<SQLString> {
|
|
||||||
- friend Query;
|
|
||||||
+class SQLQueryParms : public std::vector<SQLString> {
|
|
||||||
+ friend class Query;
|
|
||||||
private:
|
|
||||||
typedef const SQLString& ss;
|
|
||||||
SQLQuery *parent;
|
|
||||||
@@ -28,10 +28,10 @@ public:
|
|
||||||
void clear() {erase(begin(),end());} //: Clears the list
|
|
||||||
SQLString &operator [] (size_type n) {
|
|
||||||
if (n >= size()) insert(end(),(n+1) - size(), "");
|
|
||||||
- return vector<SQLString>::operator [] (n);
|
|
||||||
+ return std::vector<SQLString>::operator [] (n);
|
|
||||||
} //: Access element number n
|
|
||||||
const SQLString &operator [] (size_type n) const
|
|
||||||
- {return vector<SQLString>::operator [] (n);}
|
|
||||||
+ {return std::vector<SQLString>::operator [] (n);}
|
|
||||||
//: Access element number n
|
|
||||||
SQLString &operator [] (const char *str);
|
|
||||||
//: Access the value of the element with a key of str.
|
|
||||||
@@ -81,8 +81,8 @@ public:
|
|
||||||
enum query_reset {DONT_RESET, RESET_QUERY};
|
|
||||||
|
|
||||||
struct SQLParseElement {
|
|
||||||
- SQLParseElement(string b, char o, char n) : before(b),option(o),num(n) {}
|
|
||||||
- string before;
|
|
||||||
+ SQLParseElement(std::string b, char o, char n) : before(b),option(o),num(n) {}
|
|
||||||
+ std::string before;
|
|
||||||
char option;
|
|
||||||
char num;
|
|
||||||
};
|
|
||||||
@@ -107,22 +107,22 @@ struct SQLParseElement {
|
|
||||||
// your query before you try to use any of the *SQLQuery* specific
|
|
||||||
// methods except for *error()* and *success()*.
|
|
||||||
|
|
||||||
-class SQLQuery : public strstream {
|
|
||||||
- friend SQLQueryParms;
|
|
||||||
+class SQLQuery : public std::stringstream {
|
|
||||||
+ friend class SQLQueryParms;
|
|
||||||
private:
|
|
||||||
char* preview_char();
|
|
||||||
protected:
|
|
||||||
- bool Success;
|
|
||||||
+ bool Success_;
|
|
||||||
char* errmsg;
|
|
||||||
- vector<SQLParseElement> parsed;
|
|
||||||
- vector<string> parsed_names;
|
|
||||||
- map<string,int> parsed_nums;
|
|
||||||
+ std::vector<SQLParseElement> parsed;
|
|
||||||
+ std::vector<std::string> parsed_names;
|
|
||||||
+ std::map<std::string,int> parsed_nums;
|
|
||||||
typedef const SQLString& ss;
|
|
||||||
typedef SQLQueryParms parms;
|
|
||||||
void proc(parms &p);
|
|
||||||
|
|
||||||
public:
|
|
||||||
- SQLQuery(): Success(false), errmsg(NULL), def(this) {parsed.empty(); parsed_names.empty(); parsed_nums.empty();} //:
|
|
||||||
+ SQLQuery(): Success_(false), errmsg(NULL), def(this) {parsed.empty(); parsed_names.empty(); parsed_nums.empty();} //:
|
|
||||||
SQLQuery(const SQLQuery &q); //:
|
|
||||||
SQLQuery& operator = (const SQLQuery &q); //:
|
|
||||||
|
|
||||||
@@ -130,8 +130,8 @@ public:
|
|
||||||
|
|
||||||
void parse();
|
|
||||||
|
|
||||||
- string error () const {return errmsg;}
|
|
||||||
- bool success() const {return Success;}
|
|
||||||
+ std::string error () const {return errmsg;}
|
|
||||||
+ bool success() const {return Success_;}
|
|
||||||
|
|
||||||
operator bool () {return success();}
|
|
||||||
bool operator ! () {return !success();}
|
|
||||||
@@ -167,6 +167,7 @@ public:
|
|
||||||
|
|
||||||
template <class T> SQLQuery& update(const T &o, const T &n) {
|
|
||||||
reset();
|
|
||||||
+ enum sql_cmp_type {sql_use_compare};
|
|
||||||
*this << "UPDATE " << o.table() << " SET " << n.equal_list()
|
|
||||||
<< " WHERE " << o.equal_list(" AND ", sql_use_compare);
|
|
||||||
return *this;
|
|
||||||
@@ -184,7 +185,7 @@ public:
|
|
||||||
return *this;
|
|
||||||
} //:
|
|
||||||
|
|
||||||
- mysql_query_define_const1(string,str)
|
|
||||||
+ mysql_query_define_const1(std::string,str)
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_sql_query_cc,v 1.2 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/sql_query.cc.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/sql_query.cc 2004-01-05 00:10:32.000000000 +0100
|
|
||||||
@@ -10,9 +10,11 @@
|
|
||||||
#include "exceptions.hh"
|
|
||||||
//#include "result3.hh"
|
|
||||||
|
|
||||||
+using namespace std;
|
|
||||||
+
|
|
||||||
SQLQuery::SQLQuery(const SQLQuery &q) {
|
|
||||||
*this << q.str();
|
|
||||||
- Success = q.Success;
|
|
||||||
+ Success_ = q.Success_;
|
|
||||||
def = q.def;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -20,7 +22,7 @@ SQLQuery::SQLQuery(const SQLQuery &q) {
|
|
||||||
SQLQuery& SQLQuery::operator = (const SQLQuery &q) {
|
|
||||||
reset();
|
|
||||||
*this << q.str();
|
|
||||||
- Success = q.Success;
|
|
||||||
+ Success_ = q.Success_;
|
|
||||||
def = q.def;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
@@ -35,17 +37,10 @@ void SQLQuery::reset() {
|
|
||||||
|
|
||||||
char * SQLQuery::preview_char() {
|
|
||||||
*this << ends;
|
|
||||||
-#ifdef __USLC__
|
|
||||||
- strstreambuf *tmpbuf = rdbuf();
|
|
||||||
- uint length = tmpbuf->pcount();
|
|
||||||
-#else
|
|
||||||
- uint length = pcount();
|
|
||||||
-#endif
|
|
||||||
- char *s = new char[length+1];
|
|
||||||
- get(s, length, '\0');
|
|
||||||
- seekg (0,ios::beg);
|
|
||||||
- seekp (-1,ios::cur);
|
|
||||||
- return s;
|
|
||||||
+ std::string s = this->str();
|
|
||||||
+ seekg (0,std::ios::beg);
|
|
||||||
+ seekp (-1,std::ios::cur);
|
|
||||||
+ return (char*)s.c_str();
|
|
||||||
}
|
|
||||||
|
|
||||||
SQLString * pprepare (char option, SQLString &S, bool replace = true) {
|
|
||||||
@@ -99,15 +94,7 @@ string SQLQuery::str(const SQLQueryParms
|
|
||||||
SQLQuery *const_this = const_cast<SQLQuery *>(this);
|
|
||||||
if (!parsed.empty()) const_this->proc(const_cast<SQLQueryParms&>(p));
|
|
||||||
*const_this << ends;
|
|
||||||
-#ifdef __USLC__
|
|
||||||
- strstreambuf *tmpbuf = const_this->rdbuf();
|
|
||||||
- uint length = tmpbuf->pcount() + 1;
|
|
||||||
- char *s = new char[length];
|
|
||||||
-#else
|
|
||||||
- uint length = const_this->pcount() + 1;
|
|
||||||
- char s[length];
|
|
||||||
-#endif
|
|
||||||
- const_this->get(s, length, '\0');
|
|
||||||
+ std::string s = this->str();
|
|
||||||
const_this->seekg (0,ios::beg);
|
|
||||||
const_this->seekp (-1,ios::cur);
|
|
||||||
return string(s);
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_sql_string1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/sql_string1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/sql_string1.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -10,22 +10,22 @@
|
|
||||||
// A class subclassed from string that has the additional ability to
|
|
||||||
// convert from any valid mysql type.
|
|
||||||
|
|
||||||
-class SQLString : public string {
|
|
||||||
+class SQLString : public std::string {
|
|
||||||
public:
|
|
||||||
bool is_string;
|
|
||||||
bool dont_escape;
|
|
||||||
bool processed;
|
|
||||||
|
|
||||||
SQLString() : is_string(false) , processed(false) {}
|
|
||||||
- SQLString (const string& str) :string (str)
|
|
||||||
+ SQLString (const std::string& str) :std::string (str)
|
|
||||||
{is_string=true;processed=false;dont_escape=false;}
|
|
||||||
- SQLString (const char *str) :string (str)
|
|
||||||
+ SQLString (const char *str) :std::string (str)
|
|
||||||
{is_string=true;processed=false;dont_escape=false;}
|
|
||||||
SQLString& operator = (const char *str) {
|
|
||||||
- string::operator = (str); return *this;
|
|
||||||
+ std::string::operator = (str); return *this;
|
|
||||||
}
|
|
||||||
- SQLString& operator = (const string& str) {
|
|
||||||
- string::operator = (str); return *this;
|
|
||||||
+ SQLString& operator = (const std::string& str) {
|
|
||||||
+ std::string::operator = (str); return *this;
|
|
||||||
}
|
|
||||||
SQLString (char i) : is_string(false), processed(false)
|
|
||||||
{char s[6]; sprintf(s,"%dh",(short int)i); *this=s;}
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_stream2string3_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/stream2string3.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/stream2string3.hh 2004-01-04 23:27:18.000000000 +0100
|
|
||||||
@@ -1,21 +1,14 @@
|
|
||||||
#ifndef __stream2string3_hh__
|
|
||||||
#define __stream2string3_hh__
|
|
||||||
|
|
||||||
-#include <strstream.h>
|
|
||||||
+#include <sstream>
|
|
||||||
|
|
||||||
template<class Strng, class T>
|
|
||||||
Strng stream2string(const T &object) {
|
|
||||||
- ostrstream str;
|
|
||||||
+ std::ostringstream str;
|
|
||||||
object.out_stream(str);
|
|
||||||
- str << ends;
|
|
||||||
- Strng s = str.str();
|
|
||||||
-#ifdef __USLC__
|
|
||||||
- strstreambuf *tmpbuf = str.rdbuf();
|
|
||||||
- tmpbuf->freeze(0);
|
|
||||||
-#else
|
|
||||||
- str.freeze(0);
|
|
||||||
-#endif
|
|
||||||
- return s;
|
|
||||||
+ str << std::ends;
|
|
||||||
+ return str.str();
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_string_util_cc,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/string_util.cc.orig 2001-05-19 18:44:49.000000000 +0200
|
|
||||||
+++ sqlplusint/string_util.cc 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
|
|
||||||
-void strip (string& s) {
|
|
||||||
+void strip (std::string& s) {
|
|
||||||
int i,j = s.size() - 1; if (!s.size()) return;
|
|
||||||
for (i = 0; s[i] == ' ';i++);
|
|
||||||
if (i) s.erase(0,i); j = s.size(); if (!j) return; j--;
|
|
||||||
@@ -9,7 +9,7 @@ void strip (string& s) {
|
|
||||||
if (i != j) s.erase(i+1,(size_t)-1);
|
|
||||||
}
|
|
||||||
|
|
||||||
-void escape_string (string& s) {
|
|
||||||
+void escape_string (std::string& s) {
|
|
||||||
if (!s.size()) return;
|
|
||||||
for (unsigned int i = 0;i<s.size();i++)
|
|
||||||
{
|
|
||||||
@ -1,38 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_string_util_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/string_util.hh.orig 2001-05-19 18:44:49.000000000 +0200
|
|
||||||
+++ sqlplusint/string_util.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -3,28 +3,28 @@
|
|
||||||
#include <ctype.h>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
-extern void strip (string& s); // Strips blanks at left and right ends
|
|
||||||
+extern void strip (std::string& s); // Strips blanks at left and right ends
|
|
||||||
|
|
||||||
-extern void escape_string (string& s); // C++ equivalent of mysql_escape_string
|
|
||||||
+extern void escape_string (std::string& s); // C++ equivalent of mysql_escape_string
|
|
||||||
|
|
||||||
-inline void str_to_upr (string& s) { // Changes case of string to upper
|
|
||||||
+inline void str_to_upr (std::string& s) { // Changes case of string to upper
|
|
||||||
for (unsigned int cnt=0; cnt < s.length(); cnt++) {
|
|
||||||
char c = s[cnt]; s[cnt]=toupper(c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline void str_to_lwr (string& s) { // Changes case of string to lower
|
|
||||||
+inline void str_to_lwr (std::string& s) { // Changes case of string to lower
|
|
||||||
for (unsigned int cnt=0; cnt < s.length(); cnt++) {
|
|
||||||
char c = s[cnt]; s[cnt]=tolower(c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline void strip_all_blanks (string& s) { // Removes all blanks
|
|
||||||
+inline void strip_all_blanks (std::string& s) { // Removes all blanks
|
|
||||||
for (unsigned int counter=0;counter < s.size();counter++)
|
|
||||||
if (s[counter] == ' ') { s.erase(counter,1); counter--;}
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline void strip_all_non_num (string& s) { // Removes all non-numerics
|
|
||||||
+inline void strip_all_non_num (std::string& s) { // Removes all non-numerics
|
|
||||||
for (unsigned int counter=0;counter < s.size();counter++)
|
|
||||||
if (!isdigit(s[counter])) { s.erase(counter,1); counter--;}
|
|
||||||
}
|
|
||||||
@ -1,122 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_type_info1_hh,v 1.2 2004/12/14 17:40:44 espie Exp $
|
|
||||||
--- sqlplusint/type_info1.hh.orig Sat May 19 18:44:48 2001
|
|
||||||
+++ sqlplusint/type_info1.hh Tue Dec 14 18:38:33 2004
|
|
||||||
@@ -11,49 +11,45 @@
|
|
||||||
#include <typeinfo>
|
|
||||||
#include <map>
|
|
||||||
|
|
||||||
-#ifdef __USLC__
|
|
||||||
-using namespace std;
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
class mysql_type_info;
|
|
||||||
class mysql_ti_sql_type_info_lookup;
|
|
||||||
|
|
||||||
class mysql_ti_sql_type_info {
|
|
||||||
- friend mysql_type_info;
|
|
||||||
- friend mysql_ti_sql_type_info_lookup;
|
|
||||||
+ friend class mysql_type_info;
|
|
||||||
+ friend class mysql_ti_sql_type_info_lookup;
|
|
||||||
private:
|
|
||||||
const char *_sql_name;
|
|
||||||
- const type_info *_c_type;
|
|
||||||
+ const std::type_info *_c_type;
|
|
||||||
const unsigned char _base_type;
|
|
||||||
const bool _default;
|
|
||||||
- mysql_ti_sql_type_info (const mysql_ti_sql_type_info &b); // can't do
|
|
||||||
+ // mysql_ti_sql_type_info (const mysql_ti_sql_type_info &b); // can't do
|
|
||||||
mysql_ti_sql_type_info& operator=(const mysql_ti_sql_type_info &b); // " "
|
|
||||||
- mysql_ti_sql_type_info () {}
|
|
||||||
+ mysql_ti_sql_type_info () : _base_type(0), _default(false) {}
|
|
||||||
// OEP - didn't init _base_type and _default mysql_ti_sql_type_info () {}
|
|
||||||
// all private, only mysql_type_info can
|
|
||||||
// create because there *must* be only one copy
|
|
||||||
// of each.
|
|
||||||
- mysql_ti_sql_type_info (const char *s, const type_info &t,
|
|
||||||
+ mysql_ti_sql_type_info (const char *s, const std::type_info &t,
|
|
||||||
const unsigned char bt = 0, const bool d = false )
|
|
||||||
: _sql_name(s), _c_type(&t), _base_type(bt), _default(d) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
struct type_info_cmp {
|
|
||||||
- bool operator() (const type_info *lhs, const type_info *rhs) const {
|
|
||||||
+ bool operator() (const std::type_info *lhs, const std::type_info *rhs) const {
|
|
||||||
return lhs->before(*rhs);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
class mysql_ti_sql_type_info_lookup {
|
|
||||||
- friend mysql_type_info;
|
|
||||||
+ friend class mysql_type_info;
|
|
||||||
private:
|
|
||||||
typedef mysql_ti_sql_type_info sql_type_info;
|
|
||||||
|
|
||||||
- map<const type_info *, unsigned char, type_info_cmp> _map;
|
|
||||||
+ std::map<const std::type_info *, unsigned char, type_info_cmp> _map;
|
|
||||||
|
|
||||||
mysql_ti_sql_type_info_lookup(const sql_type_info types[], const int size);
|
|
||||||
|
|
||||||
- const unsigned char& operator [] (const type_info &ti) const {
|
|
||||||
+ const unsigned char& operator [] (const std::type_info &ti) const {
|
|
||||||
return _map.find(&ti)->second;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -94,14 +90,14 @@ public:
|
|
||||||
//:
|
|
||||||
mysql_type_info(const mysql_type_info &t) : num(t.num) {}
|
|
||||||
//:
|
|
||||||
- mysql_type_info(const type_info &t) {num = lookups[t]; }
|
|
||||||
+ mysql_type_info(const std::type_info &t) {num = lookups[t]; }
|
|
||||||
//:
|
|
||||||
mysql_type_info& operator = (unsigned char n) {num=n; return *this;}
|
|
||||||
//:
|
|
||||||
mysql_type_info& operator = (const mysql_type_info &t)
|
|
||||||
{num = t.num; return *this;}
|
|
||||||
//:
|
|
||||||
- mysql_type_info& operator = (const type_info &t)
|
|
||||||
+ mysql_type_info& operator = (const std::type_info &t)
|
|
||||||
{num = lookups[t]; return *this;}
|
|
||||||
//:
|
|
||||||
inline const char* name() const;
|
|
||||||
@@ -110,7 +106,7 @@ public:
|
|
||||||
// associated with the sql type.
|
|
||||||
inline const char* sql_name() const;
|
|
||||||
//: Returns the name for the sql type.
|
|
||||||
- inline const type_info& c_type() const;
|
|
||||||
+ inline const std::type_info& c_type() const;
|
|
||||||
inline const unsigned int length() const;
|
|
||||||
inline const unsigned int max_length() const;
|
|
||||||
//: Returns the type_info for the C++ type associated with the sql type.
|
|
||||||
@@ -146,7 +142,7 @@ inline const unsigned int mysql_type_
|
|
||||||
inline const unsigned int mysql_type_info::max_length() const {
|
|
||||||
return _max_length;
|
|
||||||
}
|
|
||||||
-inline const type_info& mysql_type_info::c_type() const {
|
|
||||||
+inline const std::type_info& mysql_type_info::c_type() const {
|
|
||||||
return *deref()._c_type;
|
|
||||||
}
|
|
||||||
inline const mysql_type_info mysql_type_info::base_type() const
|
|
||||||
@@ -172,19 +168,19 @@ inline bool operator != (const mysql_typ
|
|
||||||
return a.id() != b.id();
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline bool operator == (const type_info &a, const mysql_type_info &b) {
|
|
||||||
+inline bool operator == (const std::type_info &a, const mysql_type_info &b) {
|
|
||||||
return a == b.c_type();
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline bool operator != (const type_info &a, const mysql_type_info &b) {
|
|
||||||
+inline bool operator != (const std::type_info &a, const mysql_type_info &b) {
|
|
||||||
return a != b.c_type();
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline bool operator == (const mysql_type_info &a, const type_info &b) {
|
|
||||||
+inline bool operator == (const mysql_type_info &a, const std::type_info &b) {
|
|
||||||
return a.c_type() == b;
|
|
||||||
}
|
|
||||||
|
|
||||||
-inline bool operator != (const mysql_type_info &a, const type_info &b) {
|
|
||||||
+inline bool operator != (const mysql_type_info &a, const std::type_info &b) {
|
|
||||||
return a.c_type() != b;
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_type_info_cc,v 1.2 2004/12/14 17:40:44 espie Exp $
|
|
||||||
--- sqlplusint/type_info.cc.orig Sat May 19 18:44:48 2001
|
|
||||||
+++ sqlplusint/type_info.cc Tue Dec 14 18:30:58 2004
|
|
||||||
@@ -5,10 +5,12 @@
|
|
||||||
#include <winsock.h>
|
|
||||||
#endif
|
|
||||||
#include <mysql.h>
|
|
||||||
-#include <string.h>
|
|
||||||
+#include <string>
|
|
||||||
#include "datetime1.hh"
|
|
||||||
#include "set1.hh"
|
|
||||||
#include "type_info3.hh"
|
|
||||||
+
|
|
||||||
+using namespace std;
|
|
||||||
|
|
||||||
typedef string Enum;
|
|
||||||
|
|
||||||
@ -1,169 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_vallist1_hh,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/vallist1.hh.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/vallist1.hh 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -8,10 +8,10 @@
|
|
||||||
template <class Seq, class Manip>
|
|
||||||
struct value_list_b {
|
|
||||||
const Seq *list;
|
|
||||||
- const vector<bool> fields;
|
|
||||||
+ const std::vector<bool> fields;
|
|
||||||
const char *delem;
|
|
||||||
Manip manip;
|
|
||||||
- value_list_b(const Seq &s, const vector<bool> &f, const char *d, Manip m)
|
|
||||||
+ value_list_b(const Seq &s, const std::vector<bool> &f, const char *d, Manip m)
|
|
||||||
: list(&s), fields(f), delem(d), manip(m) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -19,11 +19,11 @@ template <class Seq1, class Seq2, class
|
|
||||||
struct equal_list_b {
|
|
||||||
const Seq1 *list1;
|
|
||||||
const Seq2 *list2;
|
|
||||||
- const vector<bool> fields;
|
|
||||||
+ const std::vector<bool> fields;
|
|
||||||
const char *delem;
|
|
||||||
const char *equl;
|
|
||||||
Manip manip;
|
|
||||||
- equal_list_b(const Seq1 &s1, const Seq2 &s2, const vector<bool> &f,
|
|
||||||
+ equal_list_b(const Seq1 &s1, const Seq2 &s2, const std::vector<bool> &f,
|
|
||||||
const char *d, const char *e, Manip m)
|
|
||||||
: list1(&s1), list2(&s2), fields(f), delem(d), equl(e), manip(m) {}
|
|
||||||
};
|
|
||||||
@@ -52,7 +52,7 @@ struct equal_list_ba {
|
|
||||||
//
|
|
||||||
|
|
||||||
template <class Seq, class Manip>
|
|
||||||
-ostream& operator << (ostream &o, const value_list_b<Seq, Manip> &cl) {
|
|
||||||
+std::ostream& operator << (std::ostream &o, const value_list_b<Seq, Manip> &cl) {
|
|
||||||
typename Seq::const_iterator i = cl.list->begin();
|
|
||||||
register int k = 0;
|
|
||||||
for (;;) {
|
|
||||||
@@ -67,7 +67,7 @@ ostream& operator << (ostream &o, const
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Seq1, class Seq2, class Manip>
|
|
||||||
-ostream& operator << (ostream &o, const equal_list_b<Seq1, Seq2, Manip> &el) {
|
|
||||||
+std::ostream& operator << (std::ostream &o, const equal_list_b<Seq1, Seq2, Manip> &el) {
|
|
||||||
typename Seq1::const_iterator i = el.list1->begin();
|
|
||||||
typename Seq2::const_iterator j = el.list2->begin();
|
|
||||||
register int k = 0;
|
|
||||||
@@ -84,7 +84,7 @@ ostream& operator << (ostream &o, const
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Seq, class Manip>
|
|
||||||
-ostream& operator << (ostream &o, const value_list_ba<Seq, Manip> &cl) {
|
|
||||||
+std::ostream& operator << (std::ostream &o, const value_list_ba<Seq, Manip> &cl) {
|
|
||||||
typename Seq::const_iterator i = cl.list->begin();
|
|
||||||
for (;;) {
|
|
||||||
o << cl.manip << *i;
|
|
||||||
@@ -95,7 +95,7 @@ ostream& operator << (ostream &o, const
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Seq1, class Seq2, class Manip>
|
|
||||||
-ostream& operator << (ostream &o, const equal_list_ba<Seq1, Seq2, Manip> &el) {
|
|
||||||
+std::ostream& operator << (std::ostream &o, const equal_list_ba<Seq1, Seq2, Manip> &el) {
|
|
||||||
typename Seq1::const_iterator i = el.list1->begin();
|
|
||||||
typename Seq2::const_iterator j = el.list2->begin();
|
|
||||||
for (;;) {
|
|
||||||
@@ -123,16 +123,16 @@ public:
|
|
||||||
// create vector
|
|
||||||
//
|
|
||||||
|
|
||||||
-void create_vector(int size, vector<bool>& v, bool t0,
|
|
||||||
+void create_vector(int size, std::vector<bool>& v, bool t0,
|
|
||||||
bool t1=false, bool t2=false, bool t3=false, bool t4=false,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false);
|
|
||||||
|
|
||||||
template <class Container>
|
|
||||||
-void create_vector(const Container&c, vector<bool>&v, string s0, string s1,
|
|
||||||
- string s2, string s3, string s4, string s5, string s6,
|
|
||||||
- string s7, string s8, string s9, string sa, string sb,
|
|
||||||
- string sc);
|
|
||||||
+void create_vector(const Container&c, std::vector<bool>&v, std::string s0, std::string s1,
|
|
||||||
+ std::string s2, std::string s3, std::string s4, std::string s5, std::string s6,
|
|
||||||
+ std::string s7, std::string s8, std::string s9, std::string sa, std::string sb,
|
|
||||||
+ std::string sc);
|
|
||||||
|
|
||||||
//
|
|
||||||
// value list
|
|
||||||
@@ -155,7 +155,7 @@ value_list(const Seq &s, const char *d,
|
|
||||||
template <class Seq, class Manip>
|
|
||||||
inline
|
|
||||||
value_list_b<Seq,Manip>
|
|
||||||
-value_list(const Seq &s, const char *d, Manip m, const vector<bool> &vb)
|
|
||||||
+value_list(const Seq &s, const char *d, Manip m, const std::vector<bool> &vb)
|
|
||||||
{
|
|
||||||
return value_list_b<Seq, Manip>(s, vb, d, m);
|
|
||||||
}
|
|
||||||
@@ -167,7 +167,7 @@ value_list(const Seq &s, const char *d,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false)
|
|
||||||
{
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(s.size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return value_list_b<Seq, Manip>(s, vb, d, m);
|
|
||||||
}
|
|
||||||
@@ -179,7 +179,7 @@ value_list(const Seq &s, const char *d,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false)
|
|
||||||
{
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(s.size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return value_list_b<Seq, do_nothing_type0> (s, vb, d, do_nothing);
|
|
||||||
}
|
|
||||||
@@ -191,7 +191,7 @@ value_list(const Seq &s, bool t0,
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false)
|
|
||||||
{
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(s.size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return value_list_b<Seq, do_nothing_type0> (s, vb, ",",do_nothing);
|
|
||||||
}
|
|
||||||
@@ -220,7 +220,7 @@ template <class Seq1, class Seq2, class
|
|
||||||
inline
|
|
||||||
equal_list_b<Seq1, Seq2, Manip>
|
|
||||||
equal_list(const Seq1 &s1, const Seq2 &s2, const char *d, const char *e,
|
|
||||||
- Manip m, const vector<bool> &vb)
|
|
||||||
+ Manip m, const std::vector<bool> &vb)
|
|
||||||
{
|
|
||||||
return equal_list_b<Seq1,Seq2,Manip>(s1, s2, vb, d, e, m);
|
|
||||||
}
|
|
||||||
@@ -234,7 +234,7 @@ equal_list(const Seq1 &s1, const Seq2 &s
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false)
|
|
||||||
{
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(s1.size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return equal_list_b<Seq1,Seq2,Manip>(s1, s2, vb, d, e, m);
|
|
||||||
}
|
|
||||||
@@ -248,7 +248,7 @@ equal_list(const Seq1 &s1, const Seq2 &s
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false)
|
|
||||||
{
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(s1.size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return equal_list_b<Seq1,Seq2,do_nothing_type0>
|
|
||||||
(s1, s2, vb, d, e, do_nothing);
|
|
||||||
@@ -262,7 +262,7 @@ equal_list(const Seq1 &s1, const Seq2 &s
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false)
|
|
||||||
{
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(s1.size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return equal_list_b<Seq1,Seq2,do_nothing_type0>
|
|
||||||
(s1, s2, vb, d, " = ", do_nothing);
|
|
||||||
@@ -276,7 +276,7 @@ equal_list(const Seq1 &s1, const Seq2 &s
|
|
||||||
bool t5=false, bool t6=false, bool t7=false, bool t8=false,
|
|
||||||
bool t9=false, bool ta=false, bool tb=false, bool tc=false)
|
|
||||||
{
|
|
||||||
- vector<bool> vb;
|
|
||||||
+ std::vector<bool> vb;
|
|
||||||
create_vector(s1.size(), vb, t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,ta,tb,tc);
|
|
||||||
return equal_list_b<Seq1,Seq2,do_nothing_type0>
|
|
||||||
(s1, s2, vb,"," ," = " ,do_nothing);
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
$OpenBSD: patch-sqlplusint_vallist_cc,v 1.1 2004/01/06 11:16:53 wilfried Exp $
|
|
||||||
--- sqlplusint/vallist.cc.orig 2001-05-19 18:44:48.000000000 +0200
|
|
||||||
+++ sqlplusint/vallist.cc 2004-01-04 23:25:47.000000000 +0100
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
#include "vallist3.hh"
|
|
||||||
#include "row2.hh"
|
|
||||||
-
|
|
||||||
-void create_vector(int size, vector<bool>& v, bool t0,
|
|
||||||
+using std::string;
|
|
||||||
+void create_vector(int size, std::vector<bool>& v, bool t0,
|
|
||||||
bool t1, bool t2, bool t3, bool t4,
|
|
||||||
bool t5, bool t6, bool t7, bool t8,
|
|
||||||
bool t9, bool ta, bool tb, bool tc)
|
|
||||||
@@ -23,7 +23,7 @@ void create_vector(int size, vector<bool
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class Container>
|
|
||||||
-void create_vector(const Container&c, vector<bool>&v, string s0, string s1,
|
|
||||||
+void create_vector(const Container&c, std::vector<bool>&v, string s0, string s1,
|
|
||||||
string s2, string s3, string s4, string s5, string s6,
|
|
||||||
string s7, string s8, string s9, string sa, string sb,
|
|
||||||
string sc)
|
|
||||||
@@ -44,7 +44,7 @@ void create_vector(const Container&c, ve
|
|
||||||
v[c.parent().field_num(sc)] = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
-template void create_vector (const Row &c, vector<bool>&v, string s0, string s1,
|
|
||||||
+template void create_vector (const Row &c, std::vector<bool>&v, string s0, string s1,
|
|
||||||
string s2, string s3, string s4, string s5, string s6,
|
|
||||||
string s7, string s8, string s9, string sa, string sb,
|
|
||||||
string sc);
|
|
||||||
@ -1,3 +1,6 @@
|
|||||||
MySQL++ is a C++ API for MySQL (and other SQL Databases Soon). The
|
MySQL++ is a C++ wrapper for MySQL's C API. It is built around STL
|
||||||
goal of this API is to make working with queries as easy as working
|
principles, to make dealing with the database as easy as dealing
|
||||||
with other STL Containers.
|
with an STL container. MySQL++ relieves the programmer of dealing
|
||||||
|
with cumbersome C data structures, generation of repetitive SQL
|
||||||
|
statements, and manual creation of C++ data structures to mirror
|
||||||
|
the database schema.
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2004/08/10 00:52:45 espie Exp $
|
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/10/07 13:24:53 wilfried Exp $
|
||||||
@lib lib/libsqlplus.so.1.7
|
@lib lib/libmysqlpp.so.2.6
|
||||||
|
|||||||
@ -1,79 +1,35 @@
|
|||||||
@comment $OpenBSD: PLIST,v 1.3 2004/08/10 00:52:45 espie Exp $
|
@comment $OpenBSD: PLIST,v 1.4 2005/10/07 13:24:53 wilfried Exp $
|
||||||
include/mysql++/
|
|
||||||
include/mysql++/coldata1.hh
|
|
||||||
include/mysql++/coldata2.hh
|
|
||||||
include/mysql++/coldata3.hh
|
|
||||||
include/mysql++/coldata4.hh
|
|
||||||
include/mysql++/compare1.hh
|
|
||||||
include/mysql++/compare2.hh
|
|
||||||
include/mysql++/compare3.hh
|
|
||||||
include/mysql++/connection0.hh
|
|
||||||
include/mysql++/connection1.hh
|
|
||||||
include/mysql++/connection2.hh
|
|
||||||
include/mysql++/connection3.hh
|
|
||||||
include/mysql++/const_string1.hh
|
|
||||||
include/mysql++/const_string2.hh
|
|
||||||
include/mysql++/const_string3.hh
|
|
||||||
include/mysql++/convert1.hh
|
|
||||||
include/mysql++/convert2.hh
|
|
||||||
include/mysql++/convert3.hh
|
|
||||||
include/mysql++/custom-macros.hh
|
|
||||||
include/mysql++/custom.hh
|
|
||||||
include/mysql++/datetime1.hh
|
|
||||||
include/mysql++/datetime2.hh
|
|
||||||
include/mysql++/datetime3.hh
|
|
||||||
include/mysql++/define_short
|
|
||||||
include/mysql++/defs
|
|
||||||
include/mysql++/exceptions.hh
|
|
||||||
include/mysql++/field_names1.hh
|
|
||||||
include/mysql++/field_names2.hh
|
|
||||||
include/mysql++/field_names3.hh
|
|
||||||
include/mysql++/field_types1.hh
|
|
||||||
include/mysql++/field_types2.hh
|
|
||||||
include/mysql++/field_types3.hh
|
|
||||||
include/mysql++/fields1.hh
|
|
||||||
include/mysql++/fields2.hh
|
|
||||||
include/mysql++/manip1.hh
|
|
||||||
include/mysql++/manip2.hh
|
|
||||||
include/mysql++/manip3.hh
|
|
||||||
include/mysql++/mysql++
|
|
||||||
include/mysql++/null1.hh
|
|
||||||
include/mysql++/null2.hh
|
|
||||||
include/mysql++/null3.hh
|
|
||||||
include/mysql++/query1.hh
|
|
||||||
include/mysql++/query2.hh
|
|
||||||
include/mysql++/query3.hh
|
|
||||||
include/mysql++/resiter1.hh
|
|
||||||
include/mysql++/result1.hh
|
|
||||||
include/mysql++/result2.hh
|
|
||||||
include/mysql++/result3.hh
|
|
||||||
include/mysql++/row1.hh
|
|
||||||
include/mysql++/row2.hh
|
|
||||||
include/mysql++/row3.hh
|
|
||||||
include/mysql++/set1.hh
|
|
||||||
include/mysql++/set2.hh
|
|
||||||
include/mysql++/set3.hh
|
|
||||||
include/mysql++/sql_query0.hh
|
|
||||||
include/mysql++/sql_query1.hh
|
|
||||||
include/mysql++/sql_query2.hh
|
|
||||||
include/mysql++/sql_query3.hh
|
|
||||||
include/mysql++/sql_string1.hh
|
|
||||||
include/mysql++/sql_string2.hh
|
|
||||||
include/mysql++/sql_string3.hh
|
|
||||||
include/mysql++/sqlplus.hh
|
|
||||||
include/mysql++/stream2string1.hh
|
|
||||||
include/mysql++/stream2string2.hh
|
|
||||||
include/mysql++/stream2string3.hh
|
|
||||||
include/mysql++/string_util.hh
|
|
||||||
include/mysql++/tiny_int1.hh
|
|
||||||
include/mysql++/tiny_int2.hh
|
|
||||||
include/mysql++/tiny_int3.hh
|
|
||||||
include/mysql++/type_info1.hh
|
|
||||||
include/mysql++/type_info2.hh
|
|
||||||
include/mysql++/type_info3.hh
|
|
||||||
include/mysql++/vallist1.hh
|
|
||||||
include/mysql++/vallist2.hh
|
|
||||||
include/mysql++/vallist3.hh
|
|
||||||
lib/libsqlplus.a
|
|
||||||
lib/libsqlplus.la
|
|
||||||
%%SHARED%%
|
%%SHARED%%
|
||||||
|
include/mysql++/
|
||||||
|
include/mysql++/coldata.h
|
||||||
|
include/mysql++/compare.h
|
||||||
|
include/mysql++/connection.h
|
||||||
|
include/mysql++/const_string.h
|
||||||
|
include/mysql++/convert.h
|
||||||
|
include/mysql++/custom-macros.h
|
||||||
|
include/mysql++/custom.h
|
||||||
|
include/mysql++/datetime.h
|
||||||
|
include/mysql++/defs.h
|
||||||
|
include/mysql++/exceptions.h
|
||||||
|
include/mysql++/field_names.h
|
||||||
|
include/mysql++/field_types.h
|
||||||
|
include/mysql++/fields.h
|
||||||
|
include/mysql++/lockable.h
|
||||||
|
include/mysql++/manip.h
|
||||||
|
include/mysql++/myset.h
|
||||||
|
include/mysql++/mysql++.h
|
||||||
|
include/mysql++/noexceptions.h
|
||||||
|
include/mysql++/null.h
|
||||||
|
include/mysql++/platform.h
|
||||||
|
include/mysql++/qparms.h
|
||||||
|
include/mysql++/query.h
|
||||||
|
include/mysql++/resiter.h
|
||||||
|
include/mysql++/result.h
|
||||||
|
include/mysql++/row.h
|
||||||
|
include/mysql++/sql_string.h
|
||||||
|
include/mysql++/stream2string.h
|
||||||
|
include/mysql++/string_util.h
|
||||||
|
include/mysql++/tiny_int.h
|
||||||
|
include/mysql++/type_info.h
|
||||||
|
include/mysql++/vallist.h
|
||||||
|
lib/libmysqlpp.la
|
||||||
|
|||||||
@ -1,35 +1,355 @@
|
|||||||
@comment $OpenBSD: PLIST-docs,v 1.3 2004/08/10 00:52:45 espie Exp $
|
@comment $OpenBSD: PLIST-docs,v 1.4 2005/10/07 13:24:53 wilfried Exp $
|
||||||
share/doc/mysql++/
|
share/doc/mysql++/
|
||||||
share/doc/mysql++/html/
|
share/doc/mysql++/refman/
|
||||||
share/doc/mysql++/html/1_Introduction.html
|
share/doc/mysql++/refman/_header.html
|
||||||
share/doc/mysql++/html/2_Overview.html
|
share/doc/mysql++/refman/annotated.html
|
||||||
share/doc/mysql++/html/3_Important.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadConversion-members.html
|
||||||
share/doc/mysql++/html/4_Tutorial.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadConversion.html
|
||||||
share/doc/mysql++/html/5_Class.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadConversion__coll__graph.png
|
||||||
@comment share/doc/mysql++/html/5_Class.html.orig
|
share/doc/mysql++/refman/classmysqlpp_1_1BadConversion__inherit__graph.png
|
||||||
share/doc/mysql++/html/6_Template.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadFieldName-members.html
|
||||||
share/doc/mysql++/html/7_Specialized.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadFieldName.html
|
||||||
share/doc/mysql++/html/8_Long.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadFieldName__coll__graph.png
|
||||||
share/doc/mysql++/html/A_Changelog.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadFieldName__inherit__graph.png
|
||||||
share/doc/mysql++/html/About_this.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadNullConversion-members.html
|
||||||
share/doc/mysql++/html/Appendices.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadNullConversion.html
|
||||||
share/doc/mysql++/html/B_Do.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadNullConversion__coll__graph.png
|
||||||
share/doc/mysql++/html/C_Credits.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadNullConversion__inherit__graph.png
|
||||||
share/doc/mysql++/html/Contents.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadOption-members.html
|
||||||
share/doc/mysql++/html/D_Copyright.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadOption.html
|
||||||
share/doc/mysql++/html/E_Feedback.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadOption__coll__graph.png
|
||||||
share/doc/mysql++/html/Introductory_Material.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadOption__inherit__graph.png
|
||||||
share/doc/mysql++/html/Usage.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadParamCount-members.html
|
||||||
share/doc/mysql++/html/WARNINGS
|
share/doc/mysql++/refman/classmysqlpp_1_1BadParamCount.html
|
||||||
share/doc/mysql++/html/contents.png
|
share/doc/mysql++/refman/classmysqlpp_1_1BadParamCount__coll__graph.png
|
||||||
share/doc/mysql++/html/index.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadParamCount__inherit__graph.png
|
||||||
share/doc/mysql++/html/internals.pl
|
share/doc/mysql++/refman/classmysqlpp_1_1BadQuery-members.html
|
||||||
share/doc/mysql++/html/labels.pl
|
share/doc/mysql++/refman/classmysqlpp_1_1BadQuery.html
|
||||||
share/doc/mysql++/html/manual.css
|
share/doc/mysql++/refman/classmysqlpp_1_1BadQuery__coll__graph.png
|
||||||
share/doc/mysql++/html/manual.html
|
share/doc/mysql++/refman/classmysqlpp_1_1BadQuery__inherit__graph.png
|
||||||
share/doc/mysql++/html/next.png
|
share/doc/mysql++/refman/classmysqlpp_1_1BasicLock-members.html
|
||||||
share/doc/mysql++/html/next_g.png
|
share/doc/mysql++/refman/classmysqlpp_1_1BasicLock.html
|
||||||
share/doc/mysql++/html/prev.png
|
share/doc/mysql++/refman/classmysqlpp_1_1BasicLock__coll__graph.png
|
||||||
share/doc/mysql++/html/prev_g.png
|
share/doc/mysql++/refman/classmysqlpp_1_1BasicLock__inherit__graph.png
|
||||||
share/doc/mysql++/html/up.png
|
share/doc/mysql++/refman/classmysqlpp_1_1ColData__Tmpl-members.html
|
||||||
share/doc/mysql++/html/up_g.png
|
share/doc/mysql++/refman/classmysqlpp_1_1ColData__Tmpl.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ColData__Tmpl__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Connection-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Connection.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ConnectionFailed-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ConnectionFailed.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ConnectionFailed__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ConnectionFailed__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Connection__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Connection__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1DBSelectionFailed-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1DBSelectionFailed.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1DBSelectionFailed__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1DBSelectionFailed__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1EndOfResultSets-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1EndOfResultSets.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1EndOfResultSets__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1EndOfResultSets__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1EndOfResults-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1EndOfResults.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1EndOfResults__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1EndOfResults__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Exception-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Exception.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Exception__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Exception__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1FieldNames-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1FieldNames.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1FieldTypes-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1FieldTypes.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Fields-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Fields.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Fields__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Fields__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Lock-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Lock.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1LockFailed-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1LockFailed.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1LockFailed__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1LockFailed__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Lock__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Lockable-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Lockable.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Lockable__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Lockable__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1MysqlCmp-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1MysqlCmp.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1MysqlCmpCStr-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1MysqlCmpCStr.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1MysqlCmpCStr__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1MysqlCmpCStr__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1MysqlCmp__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1MysqlCmp__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1NoExceptions-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1NoExceptions.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1NoExceptions__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Null-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Null.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Null__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ObjectNotInitialized-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ObjectNotInitialized.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ObjectNotInitialized__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ObjectNotInitialized__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1OptionalExceptions-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1OptionalExceptions.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1OptionalExceptions__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Query-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Query.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Query__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Query__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ResNSel-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ResNSel.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ResNSel__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ResUse-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ResUse.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ResUse__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1ResUse__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Result-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Result.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Result__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Result__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Row-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Row.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Row__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Row__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1SQLQueryParms-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1SQLQueryParms.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1SQLQueryParms__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1SQLString-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1SQLString.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Set-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1Set.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1const__string-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1const__string.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1const__subscript__container-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1const__subscript__container.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1const__subscript__container__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1mysql__type__info-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1mysql__type__info.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1null__type.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1scoped__var__set-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1scoped__var__set.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1scoped__var__set__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1subscript__iterator-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1subscript__iterator.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1subscript__iterator__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1tiny__int-members.html
|
||||||
|
share/doc/mysql++/refman/classmysqlpp_1_1tiny__int.html
|
||||||
|
share/doc/mysql++/refman/coldata_8h-source.html
|
||||||
|
share/doc/mysql++/refman/coldata_8h.html
|
||||||
|
share/doc/mysql++/refman/coldata_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/coldata_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/compare_8h-source.html
|
||||||
|
share/doc/mysql++/refman/compare_8h.html
|
||||||
|
share/doc/mysql++/refman/compare_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/compare_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/connection_8h-source.html
|
||||||
|
share/doc/mysql++/refman/connection_8h.html
|
||||||
|
share/doc/mysql++/refman/connection_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/connection_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/const__string_8h-source.html
|
||||||
|
share/doc/mysql++/refman/const__string_8h.html
|
||||||
|
share/doc/mysql++/refman/const__string_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/const__string_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/convert_8h-source.html
|
||||||
|
share/doc/mysql++/refman/convert_8h.html
|
||||||
|
share/doc/mysql++/refman/convert_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/convert_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/datetime_8h-source.html
|
||||||
|
share/doc/mysql++/refman/datetime_8h.html
|
||||||
|
share/doc/mysql++/refman/datetime_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/datetime_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/defs_8h-source.html
|
||||||
|
share/doc/mysql++/refman/defs_8h.html
|
||||||
|
share/doc/mysql++/refman/defs_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/defs_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/doxygen.css
|
||||||
|
share/doc/mysql++/refman/doxygen.png
|
||||||
|
share/doc/mysql++/refman/exceptions_8h-source.html
|
||||||
|
share/doc/mysql++/refman/exceptions_8h.html
|
||||||
|
share/doc/mysql++/refman/exceptions_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/exceptions_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/field__names_8h-source.html
|
||||||
|
share/doc/mysql++/refman/field__names_8h.html
|
||||||
|
share/doc/mysql++/refman/field__names_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/field__names_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/field__types_8h-source.html
|
||||||
|
share/doc/mysql++/refman/field__types_8h.html
|
||||||
|
share/doc/mysql++/refman/field__types_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/field__types_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/fields_8h-source.html
|
||||||
|
share/doc/mysql++/refman/fields_8h.html
|
||||||
|
share/doc/mysql++/refman/fields_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/fields_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/files.html
|
||||||
|
share/doc/mysql++/refman/functions.html
|
||||||
|
share/doc/mysql++/refman/globals.html
|
||||||
|
share/doc/mysql++/refman/graph_legend.html
|
||||||
|
share/doc/mysql++/refman/graph_legend.png
|
||||||
|
share/doc/mysql++/refman/hierarchy.html
|
||||||
|
share/doc/mysql++/refman/index.html
|
||||||
|
share/doc/mysql++/refman/inherit__graph__0.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__1.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__10.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__11.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__12.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__13.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__14.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__15.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__16.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__17.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__18.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__19.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__2.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__20.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__21.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__22.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__23.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__24.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__25.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__26.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__27.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__28.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__29.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__3.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__30.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__31.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__32.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__33.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__34.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__35.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__36.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__37.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__38.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__4.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__5.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__6.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__7.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__8.png
|
||||||
|
share/doc/mysql++/refman/inherit__graph__9.png
|
||||||
|
share/doc/mysql++/refman/inherits.html
|
||||||
|
share/doc/mysql++/refman/lockable_8h-source.html
|
||||||
|
share/doc/mysql++/refman/lockable_8h.html
|
||||||
|
share/doc/mysql++/refman/lockable_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/manip_8h-source.html
|
||||||
|
share/doc/mysql++/refman/manip_8h.html
|
||||||
|
share/doc/mysql++/refman/manip_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/manip_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/myset_8h-source.html
|
||||||
|
share/doc/mysql++/refman/myset_8h.html
|
||||||
|
share/doc/mysql++/refman/myset_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/myset_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/mysql++_8h-source.html
|
||||||
|
share/doc/mysql++/refman/mysql++_8h.html
|
||||||
|
share/doc/mysql++/refman/mysql++_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/namespacemembers.html
|
||||||
|
share/doc/mysql++/refman/namespacemysqlpp.html
|
||||||
|
share/doc/mysql++/refman/namespaces.html
|
||||||
|
share/doc/mysql++/refman/noexceptions_8h-source.html
|
||||||
|
share/doc/mysql++/refman/noexceptions_8h.html
|
||||||
|
share/doc/mysql++/refman/noexceptions_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/null_8h-source.html
|
||||||
|
share/doc/mysql++/refman/null_8h.html
|
||||||
|
share/doc/mysql++/refman/null_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/null_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/platform_8h-source.html
|
||||||
|
share/doc/mysql++/refman/platform_8h.html
|
||||||
|
share/doc/mysql++/refman/platform_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/qparms_8h-source.html
|
||||||
|
share/doc/mysql++/refman/qparms_8h.html
|
||||||
|
share/doc/mysql++/refman/qparms_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/qparms_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/query_8h-source.html
|
||||||
|
share/doc/mysql++/refman/query_8h.html
|
||||||
|
share/doc/mysql++/refman/query_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/query_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/refman.css
|
||||||
|
share/doc/mysql++/refman/resiter_8h-source.html
|
||||||
|
share/doc/mysql++/refman/resiter_8h.html
|
||||||
|
share/doc/mysql++/refman/resiter_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/resiter_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/result_8h-source.html
|
||||||
|
share/doc/mysql++/refman/result_8h.html
|
||||||
|
share/doc/mysql++/refman/result_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/result_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/row_8h-source.html
|
||||||
|
share/doc/mysql++/refman/row_8h.html
|
||||||
|
share/doc/mysql++/refman/row_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/row_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/sql__string_8h-source.html
|
||||||
|
share/doc/mysql++/refman/sql__string_8h.html
|
||||||
|
share/doc/mysql++/refman/sql__string_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/sql__string_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/stream2string_8h-source.html
|
||||||
|
share/doc/mysql++/refman/stream2string_8h.html
|
||||||
|
share/doc/mysql++/refman/stream2string_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/stream2string_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/string__util_8h-source.html
|
||||||
|
share/doc/mysql++/refman/string__util_8h.html
|
||||||
|
share/doc/mysql++/refman/string__util_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/string__util_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1DTbase-members.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1DTbase.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1DTbase__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1Date-members.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1Date.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1DateTime-members.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1DateTime.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1DateTime__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1DateTime__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1Date__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1Date__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1NullisBlank.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1NullisNull.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1NullisZero.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1SQLParseElement-members.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1SQLParseElement.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1SQLParseElement__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1Time-members.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1Time.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1Time__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1Time__inherit__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1cstr__equal__to.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1cstr__greater.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1cstr__greater__equal.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1cstr__less.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1cstr__less__equal.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1cstr__not__equal__to.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1equal__list__b-members.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1equal__list__b.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1equal__list__b__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1equal__list__ba-members.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1equal__list__ba.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1equal__list__ba__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1value__list__b-members.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1value__list__b.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1value__list__b__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1value__list__ba-members.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1value__list__ba.html
|
||||||
|
share/doc/mysql++/refman/structmysqlpp_1_1value__list__ba__coll__graph.png
|
||||||
|
share/doc/mysql++/refman/tiny__int_8h-source.html
|
||||||
|
share/doc/mysql++/refman/tiny__int_8h.html
|
||||||
|
share/doc/mysql++/refman/tiny__int_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/type__info_8h-source.html
|
||||||
|
share/doc/mysql++/refman/type__info_8h.html
|
||||||
|
share/doc/mysql++/refman/type__info_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/type__info_8h__incl.png
|
||||||
|
share/doc/mysql++/refman/vallist_8h-source.html
|
||||||
|
share/doc/mysql++/refman/vallist_8h.html
|
||||||
|
share/doc/mysql++/refman/vallist_8h__dep__incl.png
|
||||||
|
share/doc/mysql++/refman/vallist_8h__incl.png
|
||||||
|
share/doc/mysql++/userman/
|
||||||
|
share/doc/mysql++/userman/breakages.html
|
||||||
|
share/doc/mysql++/userman/index.html
|
||||||
|
share/doc/mysql++/userman/licenses.html
|
||||||
|
share/doc/mysql++/userman/overview.html
|
||||||
|
share/doc/mysql++/userman/ssqls.html
|
||||||
|
share/doc/mysql++/userman/tquery.html
|
||||||
|
share/doc/mysql++/userman/tutorial.html
|
||||||
|
share/doc/mysql++/userman/unicode.html
|
||||||
|
share/doc/mysql++/userman/userman.css
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user