add read from iostream

duckdb · Mytherin · Feb 23, 2024 · Dec 11, 2023 · Dec 11, 2023 · Dec 11, 2023
commit 40691727ab71e604183f6565a8ffa73a21a8c102
diff --git a/tools/odbc/driver.cpp b/tools/odbc/driver.cpp
@@ -407,6 +407,42 @@ SQLRETURN Connect::ParseInputStr() {
 	return SQL_SUCCESS;
 }
 
+SQLRETURN Connect::ReadFromIniFile() {
+	duckdb::unique_ptr<duckdb::FileSystem> fs = duckdb::FileSystem::CreateLocal();
+	std::string home_directory = fs->GetHomeDirectory();
+
+	std::string odbc_file = home_directory + "/.odbc.ini";
+
+	if (!fs->FileExists(odbc_file)) {
+		return SQL_SUCCESS;
+	}
+
+	if (dbc->dsn.empty()) {
+		return SQL_SUCCESS;
+	}
+
+	for (auto &key_pair : conn_str_keynames) {
+		if (CheckSet(key_pair.first)) {
+			continue;
+		}
+		const int max_val_len = 256;
+		char char_val[max_val_len];
+		int read_size = SQLGetPrivateProfileString(OdbcUtils::ConvertStringToLPCSTR(dbc->dsn), key_pair.second.c_str(),
+		                                           "", char_val, max_val_len, odbc_file.c_str());
+		if (read_size == 0) {
+			continue;
+		} else if (read_size < 0) {
+			return duckdb::SetDiagnosticRecord(dbc, SQL_ERROR, "SQLDriverConnect", "Error reading from .odbc.ini",
+			                                   SQLStateType::ST_01S09, "");
+		}
+		SQLRETURN ret = SetVal(key_pair.first, string(char_val));
+		if (ret != SQL_SUCCESS) {
+			return ret;
+		}
+	}
+	return SQL_SUCCESS;
+}
+
 SQLRETURN Connect::HandleDsn(const string &val) {
 	dbc->dsn = val;
 	set_keys[DSN] = true;
@@ -426,6 +462,10 @@ SQLRETURN Connect::HandleDatabase(const string &val) {
 }
 
 SQLRETURN Connect::SetConnection() {
+#if defined ODBC_LINK_ODBCINST || defined WIN32
+	ReadFromIniFile();
+#endif
+
 	std::string database = dbc->GetDatabaseName();
 	config.SetOptionByName("duckdb_api", "odbc");
 

diff --git a/tools/odbc/include/driver.hpp b/tools/odbc/include/driver.hpp
@@ -48,6 +48,7 @@ class Connect {
 	SQLRETURN FindMatchingKey(const std::string &input, ODBCConnStrKey &key);
 	// If the input doesn't match a keyname, find a similar keyname
 	bool FindSimilar(const std::string &input, std::string &match);
+	SQLRETURN ReadFromIniFile();
 	// Executes the connection
 	SQLRETURN SetConnection();
 

diff --git a/tools/odbc/include/odbc_utils.hpp b/tools/odbc/include/odbc_utils.hpp
@@ -64,6 +64,7 @@ struct OdbcUtils {
 
 	static SQLUINTEGER SQLPointerToSQLUInteger(SQLPOINTER value);
 	static std::string ConvertSQLCHARToString(SQLCHAR *str);
+	static LPCSTR ConvertStringToLPCSTR(const std::string &str);
 
 };
 } // namespace duckdb

diff --git a/tools/odbc/odbc_utils.cpp b/tools/odbc/odbc_utils.cpp
@@ -225,3 +225,7 @@ SQLUINTEGER OdbcUtils::SQLPointerToSQLUInteger(SQLPOINTER value) {
 std::string OdbcUtils::ConvertSQLCHARToString(SQLCHAR *str) {
 	return std::string(reinterpret_cast<char *>(str));
 }
+
+LPCSTR duckdb::OdbcUtils::ConvertStringToLPCSTR(const std::string &str) {
+	return reinterpret_cast<LPCSTR>(const_cast<char *>(str.c_str()));
+}