--- a/src/PreparedStatement.cpp	Mon May 25 21:11:17 2020 +0200
+++ b/src/PreparedStatement.cpp	Sun May 31 16:56:07 2020 +0200
@@ -16,89 +16,77 @@
  */
 
 #include <cstring>
+#include <iostream>
 
-#include <sqlite3.h>
+#include <sql.h>
+#include <sqlext.h>
 
 #include "PreparedStatement.h"
+#include "ResultSet.h"
+#include "OdbcCommon.h"
 
 namespace relpipe {
 namespace tr {
 namespace sql {
 
-PreparedStatement::PreparedStatement(void* stmt) : stmt(stmt) {
+PreparedStatement::PreparedStatement(void* stmt) : statement(stmt) {
 }
 
 PreparedStatement::~PreparedStatement() {
-	sqlite3_finalize((sqlite3_stmt*) stmt);
+	OdbcCommon::freeHandle(SQL_HANDLE_STMT, statement);
+}
+
+ResultSet* PreparedStatement::executeQuery() {
+	SQLRETURN result = SQLExecute(statement);
+	if (OdbcCommon::isNotSuccessful(result)) throw SqlException(L"Unable to execute (query) prepared statement", result, SQL_HANDLE_STMT, statement);
+	return new ResultSet(statement);
 }
 
-void PreparedStatement::setBoolean(int parameterIndex, relpipe::reader::boolean_t value) {
-	int result = sqlite3_bind_int((sqlite3_stmt*) stmt, parameterIndex, value);
-	if (result != SQLITE_OK) throw SqlException(L"Unable to set SQLite parameter.");
-}
+long PreparedStatement::executeUpdate() {
+	SQLRETURN result;
+	SQLLEN count = 0; // returned e.g. on empty statement: ""
 
-void PreparedStatement::setInteger(int parameterIndex, relpipe::reader::integer_t value) {
-	int result = sqlite3_bind_int64((sqlite3_stmt*) stmt, parameterIndex, value);
-	if (result != SQLITE_OK) throw SqlException(L"Unable to set SQLite parameter.");
+	result = SQLExecute(statement);
+	// PostgreSQL returns SUCCESS but SQLite returns SQL_NO_DATA_FOUND:
+	if (OdbcCommon::isNotSuccessful(result) && result != SQL_NO_DATA_FOUND) throw SqlException(L"Unable to execute (update) prepared statement", result, SQL_HANDLE_STMT, statement);
+
+	result = SQLRowCount(statement, &count);
+	if (OdbcCommon::isNotSuccessful(result)) throw SqlException(L"Unable to get updated record count", result, SQL_HANDLE_STMT, statement);
+
+	return count;
 }
 
-void PreparedStatement::setString(int parameterIndex, std::string value) {
-	int result = sqlite3_bind_text((sqlite3_stmt*) stmt, parameterIndex, value.c_str(), -1, SQLITE_TRANSIENT);
-	if (result != SQLITE_OK) throw SqlException(L"Unable to set SQLite parameter.");
+void PreparedStatement::setBoolean(int parameterNumber, relpipe::reader::boolean_t value) {
+	booleanParameters.emplace_back(value);
+	// TODO: review SQL_C_TINYINT
+	SQLRETURN result = SQLBindParameter(statement, parameterNumber, SQL_PARAM_INPUT, SQL_C_TINYINT, SQL_INTEGER, 0, 0, &booleanParameters.back(), 0, nullptr);
+	if (OdbcCommon::isNotSuccessful(result)) throw SqlException(L"Unable to set boolean parameter in prepared statement", result, SQL_HANDLE_STMT, statement);
 }
 
-void PreparedStatement::setNull(int parameterIndex) {
-	int result = sqlite3_bind_null((sqlite3_stmt*) stmt, parameterIndex);
-	if (result != SQLITE_OK) throw SqlException(L"Unable to set SQLite parameter.");
+void PreparedStatement::setInteger(int parameterNumber, relpipe::reader::integer_t value) {
+	integerParameters.emplace_back(value);
+	SQLRETURN result = SQLBindParameter(statement, parameterNumber, SQL_PARAM_INPUT, SQL_C_LONG, SQL_INTEGER, 0, 0, &integerParameters.back(), 0, nullptr);
+	if (OdbcCommon::isNotSuccessful(result)) throw SqlException(L"Unable to set integer parameter in prepared statement", result, SQL_HANDLE_STMT, statement);
 }
 
-bool PreparedStatement::next() {
-	int result = sqlite3_step((sqlite3_stmt*) stmt);
-	if (result == SQLITE_ROW) return true;
-	else if (result == SQLITE_DONE) return false;
-	else throw SqlException(L"Error while iterating over SQLite result.");
+void PreparedStatement::setString(int parameterNumber, relpipe::reader::string_t value) {
+	std::string valueBytes = convertor.to_bytes(value);
+	stringParameters.emplace_back(std::make_pair(valueBytes, valueBytes.size()));
+	SQLRETURN result = SQLBindParameter(statement, parameterNumber, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, 0, 0, (void *) stringParameters.back().first.c_str(), 0, &stringParameters.back().second);
+	if (OdbcCommon::isNotSuccessful(result)) throw SqlException(L"Unable to set string parameter in prepared statement", result, SQL_HANDLE_STMT, statement);
+}
+
+void PreparedStatement::setNull(int parameterNumber) {
+	throw SqlException(L"Use ODBC: setNull()");
 }
 
 void PreparedStatement::reset() {
-	int result = sqlite3_reset((sqlite3_stmt*) stmt);
-	if (result != SQLITE_OK) throw SqlException(L"Unable to reset SQLite prepared statement.");
-}
-
-int PreparedStatement::getColumnCount() {
-	return sqlite3_column_count((sqlite3_stmt*) stmt);
-}
-
-std::string PreparedStatement::getColumName(int columnIndex) {
-	const char* name = sqlite3_column_name((sqlite3_stmt*) stmt, columnIndex);
-	if (name) return name;
-	else throw SqlException(L"Unable to get SQLite column name.");
-}
-
-relpipe::writer::TypeId PreparedStatement::getColumType(int columnIndex, relpipe::writer::TypeId defaultType) {
-	const char* type = sqlite3_column_decltype((sqlite3_stmt*) stmt, columnIndex);
-
-	// TODO: sqlite3_column_decltype returns value only for columns of existing tables, not for dynamic expressions – SQLite uses dynamic types
-	// maybe we could write a function/module that returns result set metadata for given query (before executing it)
-	// or use at least explicit casts in SQL and modify sqlite3_column_decltype() function or add some new one to return such casted type
-	// 
-	// fprintf(stderr, "%d → %s\n", columnIndex, type);
-	// SELECT typeof(1+1); == "integer"
-	// https://www.sqlite.org/c3ref/column_decltype.html – sqlite3_column_decltype
-	// https://www.sqlite.org/c3ref/column_blob.html – sqlite3_column_type
-	// https://www.sqlite.org/datatype3.html – Datatypes In SQLite Version 3
-	// https://dba.stackexchange.com/questions/203220/sqlite-what-is-the-use-of-specifying-data-types
-	// https://www.mail-archive.com/sqlite-users@mailinglists.sqlite.org/msg118093.html
-
-	if (type == nullptr) return relpipe::writer::TypeId::STRING;
-	else if (strcmp(type, "integer") == 0) return relpipe::writer::TypeId::INTEGER;
-	else if (strcmp(type, "text") == 0) return relpipe::writer::TypeId::STRING;
-	else return defaultType;
-	// TODO: support also other data types
-}
-
-std::string PreparedStatement::getString(int columnIndex) {
-	const char* value = (const char*) sqlite3_column_text((sqlite3_stmt*) stmt, columnIndex);
-	return value ? value : ""; // TODO: support NULL values (when supported in relpipe format)
+	// TODO: do also SQL_UNBIND if column binding is used
+	SQLRETURN result = SQLFreeStmt(statement, SQL_RESET_PARAMS);
+	if (OdbcCommon::isNotSuccessful(result)) throw SqlException(L"Unable to reset prepared statement", result, SQL_HANDLE_STMT, statement);
+	booleanParameters.clear();
+	integerParameters.clear();
+	stringParameters.clear();
 }
 
 }