Pass string_view by value

Author: jimmyjxiao

hdr/sqlite_modern_cpp.h

@@ -85,11 +85,11 @@ namespace sqlite {
 			return ++_inx;
 		}
 
-		sqlite3_stmt* _prepare(const U16STR_REF& sql) {
+		sqlite3_stmt* _prepare(U16STR_REF sql) {
 			return _prepare(utility::utf16_to_utf8(sql));
 		}
 
-		sqlite3_stmt* _prepare(const STR_REF& sql) {
+		sqlite3_stmt* _prepare(STR_REF sql) {
 			int hresult;
 			sqlite3_stmt* tmp = nullptr;
 			const char *remaining;
@@ -105,13 +105,13 @@ namespace sqlite {
 
 	public:
 
-		database_binder(std::shared_ptr<sqlite3> db, U16STR_REF const & sql):
+		database_binder(std::shared_ptr<sqlite3> db, U16STR_REF  sql):
 			_db(db),
 			_stmt(_prepare(sql), sqlite3_finalize),
 			_inx(0) {
 		}
 
-		database_binder(std::shared_ptr<sqlite3> db, STR_REF const & sql):
+		database_binder(std::shared_ptr<sqlite3> db, STR_REF sql):
 			_db(db),
 			_stmt(_prepare(sql), sqlite3_finalize),
 			_inx(0) {
@@ -380,22 +380,14 @@ namespace sqlite {
 		database(std::shared_ptr<sqlite3> db):
 			_db(db) {}
 
-		database_binder operator<<(const STR_REF& sql) {
+		database_binder operator<<(STR_REF sql) {
 			return database_binder(_db, sql);
 		}
 
-		database_binder operator<<(const char* sql) {
-			return *this << STR_REF(sql);
-		}
-
-		database_binder operator<<(const U16STR_REF& sql) {
+		database_binder operator<<(U16STR_REF sql) {
 			return database_binder(_db, sql);
 		}
 
-		database_binder operator<<(const char16_t* sql) {
-			return *this << U16STR_REF(sql);
-		}
-
 		connection_type connection() const { return _db; }
 
 		sqlite3_int64 last_insert_rowid() const {
@@ -646,5 +638,4 @@ namespace sqlite {
 		}
 	}
 }
-#undef STR_REF
-#undef U16STR_REF
+

hdr/sqlite_modern_cpp/type_wrapper.h

@@ -37,11 +37,11 @@
 #endif
 #ifdef MODERN_SQLITE_STRINGVIEW_SUPPORT
 #include <string_view>
-typedef std::string_view STR_REF;
-typedef std::u16string_view U16STR_REF;
+typedef const std::string_view STR_REF;
+typedef const std::u16string_view U16STR_REF;
 #else
-typedef std::string STR_REF;
-typedef std::u16string U16STR_REF;
+typedef const std::string& STR_REF;
+typedef const std::u16string& U16STR_REF;
 #endif
 #include <sqlite3.h>
 #include "errors.h"
@@ -164,12 +164,14 @@ namespace sqlite {
 	// STR_REF
 	template<>
 	struct has_sqlite_type<std::string, SQLITE3_TEXT, void> : std::true_type {};
-	inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, const STR_REF& val) {
+	inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, STR_REF val) {
 		return sqlite3_bind_text(stmt, inx, val.data(), val.length(), SQLITE_TRANSIENT);
 	}
 
 	// Convert char* to string_view to trigger op<<(..., const STR_REF )
-	template<std::size_t N> inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, const char(&STR)[N]) { return bind_col_in_db(stmt, inx, STR_REF(STR, N-1)); }
+	template<std::size_t N> inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, const char(&STR)[N]) { 
+		return sqlite3_bind_text(stmt, inx, &STR[0], N-1, SQLITE_TRANSIENT); 
+	}
 
 	inline std::string get_col_from_db(sqlite3_stmt* stmt, int inx, result_type<std::string>) {
 		return sqlite3_column_type(stmt, inx) == SQLITE_NULL ? std::string() :
@@ -180,18 +182,20 @@ namespace sqlite {
 			std::string(reinterpret_cast<char const *>(sqlite3_value_text(value)), sqlite3_value_bytes(value));
 	}
 
-	inline void store_result_in_db(sqlite3_context* db, const STR_REF& val) {
+	inline void store_result_in_db(sqlite3_context* db, STR_REF val) {
 		sqlite3_result_text(db, val.data(), val.length(), SQLITE_TRANSIENT);
 	}
 	// U16STR_REF
 	template<>
 	struct has_sqlite_type<std::u16string, SQLITE3_TEXT, void> : std::true_type {};
-	inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, const U16STR_REF& val) {
+	inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, U16STR_REF val) {
 		return sqlite3_bind_text16(stmt, inx, val.data(), sizeof(char16_t) * val.length(), SQLITE_TRANSIENT);
 	}
 
 	// Convert char* to string_view to trigger op<<(..., const STR_REF )
-	template<std::size_t N> inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, const char16_t(&STR)[N]) { return bind_col_in_db(stmt, inx, U16STR_REF(STR, N-1)); }
+	template<std::size_t N> inline int bind_col_in_db(sqlite3_stmt* stmt, int inx, const char16_t(&STR)[N]) { 
+		return sqlite3_bind_text16(stmt, inx, &STR[0], N-1, SQLITE_TRANSIENT);
+	}
 
 	inline std::u16string get_col_from_db(sqlite3_stmt* stmt, int inx, result_type<std::u16string>) {
 		return sqlite3_column_type(stmt, inx) == SQLITE_NULL ? std::u16string() :
@@ -202,7 +206,7 @@ namespace sqlite {
 			std::u16string(reinterpret_cast<char16_t const *>(sqlite3_value_text16(value)), sqlite3_value_bytes16(value));
 	}
 
-	inline void store_result_in_db(sqlite3_context* db, const U16STR_REF& val) {
+	inline void store_result_in_db(sqlite3_context* db, U16STR_REF val) {
 		sqlite3_result_text16(db, val.data(), sizeof(char16_t) * val.length(), SQLITE_TRANSIENT);
 	}