add double/float supporting for query class of db module

Author: zhengshuxin

lib_acl_cpp/changes.txt

@@ -1,6 +1,9 @@
 �޸���ʷ�б���
 
 ------------------------------------------------------------------------
+329) 2015.7.21
+329.1) feature: db ģ��IJ�ѯ�� query ������ double/float ����
+
 328) 2015.7.19
 328.1) bugfix: redis_command.cpp �е� run(redis_client_cluster*, size_t) ����
 �п��ܴ��ڵ� conn �����ͷź��ٴηǷ����õ����Σ����ڽ��ö�����ͷŷ������õĴ���֮��

lib_acl_cpp/include/acl_cpp/db/db_handle.hpp

@@ -99,8 +99,21 @@ class ACL_CPP_API db_row
 	long long int field_int64(const char* name, long long int null_value = 0) const;
 #endif
 
-	double field_double(size_t ifield, double null_value = 0) const;
-	double field_double(const char* name, double null_value = 0) const;
+	/**
+	 * 从查询结果的记录行中取得字段名的浮点类型的字段值
+	 * @param ifield {size_t} 下标值
+	 * @param null_value {double} 当结果为空时，返回此值表示未有相应结果
+	 * @return {double} 当返回值与用户输入的 null_value 值相同时表明没有查到结果
+	 */
+	double field_double(size_t ifield, double null_value = 0.0) const;
+
+	/**
+	 * 从查询结果的记录行中取得字段名的浮点类型的字段值
+	 * @param name {const char*} 下标值
+	 * @param null_value {double} 当结果为空时，返回此值表示未有相应结果
+	 * @return {double} 当返回值与用户输入的 null_value 值相同时表明没有查到结果
+	 */
+	double field_double(const char* name, double null_value = 0.0) const;
 
 	/**
 	 * 从查询结果的记录行中取得对应下标的字符串类型的字段值
@@ -127,7 +140,7 @@ class ACL_CPP_API db_row
 	 * @return {size_t}
 	 */
 	size_t length() const;
-protected:
+
 private:
 	// 数据表的字段名集合的引用
 	const std::vector<const char*>& names_;
@@ -181,6 +194,7 @@ class ACL_CPP_API db_rows
 	 * @return {size_t} 行记录个数
 	 */
 	size_t length() const;
+
 protected:
 	// 数据表字段名
 	std::vector<const char*> names_;
@@ -191,7 +205,6 @@ class ACL_CPP_API db_rows
 
 	// 临时结果行集合
 	std::vector<const db_row*> rows_tmp_;
-private:
 };
 
 class db_pool;
@@ -404,6 +417,7 @@ class ACL_CPP_API db_handle
 	{
 		return when_;
 	}
+
 protected:
 	// 临时结果对象
 	db_rows* result_;

lib_acl_cpp/include/acl_cpp/db/query.hpp

@@ -57,6 +57,22 @@ class ACL_CPP_API query
 	 */
 	query& set_parameter(const char* name, int value);
 
+	/**
+	 * 设置单精度浮点类型的变量值
+	 * @param name {const char*} 变量名
+	 * @param value {float} 单精度浮点类型
+	 * @return {query&}
+	 */
+	query& set_parameter(const char* name, float value);
+
+	/**
+	 * 设置双精度浮点类型的变量值
+	 * @param name {const char*} 变量名
+	 * @param value {double} 双精度浮点类型
+	 * @return {query&}
+	 */
+	query& set_parameter(const char* name, double value);
+
 	/**
 	 * 设置 64 位短整类型的变量值
 	 * @param name {const char*} 变量名
@@ -136,6 +152,8 @@ class ACL_CPP_API query
 		DB_PARAM_SHORT,
 		DB_PARAM_INT32,
 		DB_PARAM_INT64,
+		DB_PARAM_FLOAT,
+		DB_PARAM_DOUBLE,
 		DB_PARAM_STR
 	} db_param_type;
 
@@ -149,6 +167,8 @@ class ACL_CPP_API query
 			short s;
 			int   n;
 			long long int l;
+			double d;
+			float f;
 			char  S[1];
 		} v;
 	};

lib_acl_cpp/src/db/db_handle.cpp

@@ -113,7 +113,7 @@ acl_int64 db_row::field_int64(const char* name, acl_int64 null_value /* = 0 */)
 		return ACL_DB_ATOU(ptr);
 }
 
-double db_row::field_double(size_t ifield, double null_value /* = 0 */) const
+double db_row::field_double(size_t ifield, double null_value /* = 0.0 */) const
 {
 	const char* ptr = field_value(ifield);
 	if (ptr == NULL)
@@ -122,7 +122,7 @@ double db_row::field_double(size_t ifield, double null_value /* = 0 */) const
 		return atof(ptr);
 }
 
-double db_row::field_double(const char* name, double null_value /* = 0 */) const
+double db_row::field_double(const char* name, double null_value /* = 0.0 */) const
 {
 	const char* ptr = field_value(name);
 	if (ptr == NULL)

lib_acl_cpp/src/db/query.cpp

@@ -156,8 +156,7 @@ query& query::set_parameter(const char* name, char value)
 	key.lower();
 	del_param(key);
 
-	query_param* param = (query_param*)
-		acl_mymalloc(sizeof(query_param));
+	query_param* param = (query_param*) acl_mymalloc(sizeof(query_param));
 	param->type = DB_PARAM_CHAR;
 	param->v.c = value;
 	param->dlen = sizeof(char);
@@ -172,8 +171,7 @@ query& query::set_parameter(const char* name, short value)
 	key.lower();
 	del_param(key);
 
-	query_param* param = (query_param*)
-		acl_mymalloc(sizeof(query_param));
+	query_param* param = (query_param*) acl_mymalloc(sizeof(query_param));
 	param->type = DB_PARAM_SHORT;
 	param->v.s = value;
 	param->dlen = sizeof(short);
@@ -188,8 +186,7 @@ query& query::set_parameter(const char* name, int value)
 	key.lower();
 	del_param(key);
 
-	query_param* param = (query_param*)
-		acl_mymalloc(sizeof(query_param));
+	query_param* param = (query_param*) acl_mymalloc(sizeof(query_param));
 	param->type = DB_PARAM_INT32;
 	param->v.n = value;
 	param->dlen = sizeof(int);
@@ -204,8 +201,7 @@ query& query::set_parameter(const char* name, acl_int64 value)
 	key.lower();
 	del_param(key);
 
-	query_param* param = (query_param*)
-		acl_mymalloc(sizeof(query_param));
+	query_param* param = (query_param*) acl_mymalloc(sizeof(query_param));
 	param->type = DB_PARAM_INT64;
 	param->v.l = value;
 	param->dlen = sizeof(long long int);
@@ -214,6 +210,36 @@ query& query::set_parameter(const char* name, acl_int64 value)
 	return *this;
 }
 
+query& query::set_parameter(const char* name, float value)
+{
+	string key(name);
+	key.lower();
+	del_param(key);
+
+	query_param* param = (query_param*) acl_mymalloc(sizeof(query_param));
+	param->type = DB_PARAM_FLOAT;
+	param->v.f = value;
+	param->dlen = sizeof(float);
+
+	params_[key] = param;
+	return *this;
+}
+
+query& query::set_parameter(const char* name, double value)
+{
+	string key(name);
+	key.lower();
+	del_param(key);
+
+	query_param* param = (query_param*) acl_mymalloc(sizeof(query_param));
+	param->type = DB_PARAM_DOUBLE;
+	param->v.d = value;
+	param->dlen = sizeof(double);
+
+	params_[key] = param;
+	return *this;
+}
+
 query& query::set_date(const char* name, time_t value,
 	const char* fmt /* = "%Y-%m-%d %H:%M:%S" */)
 {