api   api 
skipping to change at line 80 skipping to change at line 80
Lob( Lob_Impl* impl ); Lob( Lob_Impl* impl );
friend class Result; friend class Result;
public: public:
~Lob(); ~Lob();
Lob& operator=( const Lob& ref ); Lob& operator=( const Lob& ref );
ssize_t read( void* buffer, size_t buflen ); ssize_t read( void* buffer, size_t buflen );
ssize_t write( void* buffer, size_t buflen );
}; };
class Result class Result
{ {
protected: protected:
Result_Impl* m_impl; Result_Impl* m_impl;
int* m_ref; int* m_ref;
Result(); Result();
skipping to change at line 117 skipping to change at line 118
odbxtype getColumnType( unsigned long pos ); odbxtype getColumnType( unsigned long pos );
unsigned long getFieldLength( unsigned long pos ); unsigned long getFieldLength( unsigned long pos );
const char* getFieldValue( unsigned long pos ); const char* getFieldValue( unsigned long pos );
Lob getLob( const char* value ); Lob getLob( const char* value );
}; };
class Stmt class Stmt
{ {
public:
enum Type { Simple };
enum Flags { None = 0, Null = 1, Quote = 2 };
~Stmt();
Stmt& operator=( const Stmt& ref );
void bind( const void* data, unsigned long size, size_t pos,
int flags );
string& escape( const string& from, string& to );
string& escape( const char* from, unsigned long fromlen, str
ing& to );
size_t count();
Result execute();
protected: protected:
int* m_ref; int* m_ref;
Stmt_Impl* m_impl; Stmt_Impl* m_impl;
Stmt(); Stmt();
Stmt( Stmt_Impl* impl ); Stmt( Stmt_Impl* impl );
friend class Conn; friend class Conn;
public:
enum Type { Simple };
~Stmt();
Stmt& operator=( const Stmt& ref );
Result execute();
}; };
class Conn class Conn
{ {
protected: protected:
Conn_Impl* m_impl; Conn_Impl* m_impl;
int* m_ref; int* m_ref;
public: public:
skipping to change at line 169 skipping to change at line 163
void bind( const char* database, const char* who, const char * cred, odbxbind method = ODBX_BIND_SIMPLE ); void bind( const char* database, const char* who, const char * cred, odbxbind method = ODBX_BIND_SIMPLE );
void bind( const string& database, const string& who, const string& cred, odbxbind method = ODBX_BIND_SIMPLE ); void bind( const string& database, const string& who, const string& cred, odbxbind method = ODBX_BIND_SIMPLE );
void unbind(); void unbind();
bool getCapability( odbxcap cap ); bool getCapability( odbxcap cap );
void getOption( odbxopt option, void* value ); void getOption( odbxopt option, void* value );
void setOption( odbxopt option, void* value ); void setOption( odbxopt option, void* value );
string& escape( const string& from, string& to );
string& escape( const char* from, unsigned long fromlen, str
ing& to );
Stmt create( Stmt::Type type, const char* sql, unsigned long size ); Stmt create( Stmt::Type type, const char* sql, unsigned long size );
Stmt create( Stmt::Type type, const string& sql ); Stmt create( Stmt::Type type, const string& sql );
}; };
} // namespace OpenDBX } // namespace OpenDBX
} // extern C++ } // extern C++
#endif #endif
 End of changes. 4 change blocks. 
18 lines changed or deleted 14 lines changed or added


 api.h   api.h 
skipping to change at line 259 skipping to change at line 259
const char* odbx_error( odbx_t* handle, int error ); const char* odbx_error( odbx_t* handle, int error );
int odbx_error_type( odbx_t* handle, int error ); int odbx_error_type( odbx_t* handle, int error );
int odbx_escape( odbx_t* handle, const char* from, unsigned long fromlen, c har* to, unsigned long* tolen ); int odbx_escape( odbx_t* handle, const char* from, unsigned long fromlen, c har* to, unsigned long* tolen );
int odbx_query( odbx_t* handle, const char* query, unsigned long length ); int odbx_query( odbx_t* handle, const char* query, unsigned long length );
int odbx_result( odbx_t* handle, odbx_result_t** result, struct timeval* ti meout, unsigned long chunk ); int odbx_result( odbx_t* handle, odbx_result_t** result, struct timeval* ti meout, unsigned long chunk );
void odbx_result_free( odbx_result_t* result ); int odbx_result_finish( odbx_result_t* result );
int odbx_row_fetch( odbx_result_t* result ); int odbx_row_fetch( odbx_result_t* result );
uint64_t odbx_rows_affected( odbx_result_t* result ); uint64_t odbx_rows_affected( odbx_result_t* result );
unsigned long odbx_column_count( odbx_result_t* result ); unsigned long odbx_column_count( odbx_result_t* result );
const char* odbx_column_name( odbx_result_t* result, unsigned long pos ); const char* odbx_column_name( odbx_result_t* result, unsigned long pos );
int odbx_column_type( odbx_result_t* result, unsigned long pos ); int odbx_column_type( odbx_result_t* result, unsigned long pos );
skipping to change at line 283 skipping to change at line 283
const char* odbx_field_value( odbx_result_t* result, unsigned long pos ); const char* odbx_field_value( odbx_result_t* result, unsigned long pos );
/* /*
* ODBX large object operations * ODBX large object operations
*/ */
int odbx_lo_open( odbx_result_t* result, odbx_lo_t** lo, const char* value ); int odbx_lo_open( odbx_result_t* result, odbx_lo_t** lo, const char* value );
ssize_t odbx_lo_read( odbx_lo_t* lo, void* buffer, size_t buflen ); ssize_t odbx_lo_read( odbx_lo_t* lo, void* buffer, size_t buflen );
ssize_t odbx_lo_write( odbx_lo_t* lo, void* buffer, size_t buflen );
int odbx_lo_close( odbx_lo_t* lo ); int odbx_lo_close( odbx_lo_t* lo );
/* /*
* Depricated defines and functions * Depricated defines and functions
* *
* They won't be available in version 2.0 any more * They won't be available in version 2.0 any more
* Please don't use and replace them in your code * Please don't use and replace them in your code
*/ */
/* /*
skipping to change at line 343 skipping to change at line 345
*/ */
#define ODBX_ERR_TOOLONG ODBX_ERR_SIZE #define ODBX_ERR_TOOLONG ODBX_ERR_SIZE
/* /*
* Depricated functions * Depricated functions
*/ */
int odbx_bind_simple( odbx_t* handle, const char* database, const char* use rname, const char* password ); int odbx_bind_simple( odbx_t* handle, const char* database, const char* use rname, const char* password );
void odbx_result_free( odbx_result_t* result );
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/