DataBase.cpp: Remove tmp prefix from wildcard variables (9b403bd8) · Commits · tango-controls / TangoDatabase

DataBase.cpp

+54 −55

Original line number	Diff line number	Diff line
		@@ -1332,12 +1332,12 @@ void DataBase::db_delete_device_attribute(const Tango::DevVarStringArray *argin)

		// replace database wildcards (% and _)

		std::string tmp_wildcard = replace_wildcard(device.c_str());
		std::string device_resolved = replace_wildcard(device.c_str());

		// then delete device from the property_attribute_device table

		DatabaseConnectionHandle dch(dcp);
		sql_query_stream << "DELETE FROM property_attribute_device WHERE device LIKE \"" << tmp_wildcard
		sql_query_stream << "DELETE FROM property_attribute_device WHERE device LIKE \"" << device_resolved
		<< "\" AND attribute LIKE \"" << attribute << "\" ";
		DEBUG_STREAM << "DataBase::db_delete_device_attribute(): sql_query " << sql_query_stream.str() << std::endl;
		simple_query(sql_query_stream.str(), "db_delete_device_attribute()", dch);
		@@ -2108,7 +2108,7 @@ Tango::DevVarStringArray *DataBase::db_get_attribute_alias_list(Tango::DevString
		/* clang-format on */

		TangoSys_MemStream sql_query_stream;
		std::string tmp_wildcard;
		std::string alias;
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;
		@@ -2116,8 +2116,8 @@ Tango::DevVarStringArray *DataBase::db_get_attribute_alias_list(Tango::DevString
		INFO_STREAM << "DataBase::db_get_attribute_alias_list(): alias " << argin;
		WARN_STREAM << " wildcard " << argin << std::endl;

		tmp_wildcard = replace_wildcard(argin);
		sql_query_stream << "SELECT DISTINCT alias,attribute FROM attribute_alias WHERE alias LIKE \"" << tmp_wildcard
		alias = replace_wildcard(argin);
		sql_query_stream << "SELECT DISTINCT alias,attribute FROM attribute_alias WHERE alias LIKE \"" << alias
		<< "\" ORDER BY attribute";

		DEBUG_STREAM << "DataBase::db_get_attribute_alias_list(): sql_query " << sql_query_stream.str() << std::endl;
		@@ -2178,16 +2178,16 @@ Tango::DevVarStringArray *DataBase::db_get_class_attribute_list(const Tango::Dev
		int n_rows = 0;
		argout = new Tango::DevVarStringArray;
		const char class_name, wildcard;
		std::string tmp_wildcard;
		std::string attribute;

		class_name = (*class_wildcard)[0];
		INFO_STREAM << "DataBase::db_get_class_attribute(): get attributes for class " << class_name << std::endl;

		wildcard = (*class_wildcard)[1];

		tmp_wildcard = replace_wildcard(wildcard);
		attribute = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT attribute FROM property_attribute_class WHERE class = \"" << class_name
		<< "\" AND attribute like \"" << tmp_wildcard << "\"";
		<< "\" AND attribute like \"" << attribute << "\"";

		DEBUG_STREAM << "DataBase::GetClassAttributeList(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -3059,15 +3059,15 @@ Tango::DevVarStringArray *DataBase::db_get_device_alias_list(Tango::DevString ar

		Tango::DevString wildcard = argin;
		TangoSys_MemStream sql_query_stream;
		std::string tmp_wildcard;
		std::string alias;
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;

		INFO_STREAM << "DataBase::db_get_device_alias_list(): wild card " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT alias FROM device WHERE alias LIKE \"" << tmp_wildcard << "\" ORDER BY alias";
		alias = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT alias FROM device WHERE alias LIKE \"" << alias << "\" ORDER BY alias";

		DEBUG_STREAM << "DataBase::db_get_device_alias_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -3122,7 +3122,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_attribute_list(const Tango::De

		const Tango::DevVarStringArray *device_wildcard = argin;
		TangoSys_MemStream sql_query_stream;
		std::string tmp_wildcard;
		std::string attribute;
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;
		@@ -3133,9 +3133,9 @@ Tango::DevVarStringArray *DataBase::db_get_device_attribute_list(const Tango::De
		INFO_STREAM << "DataBase::db_get_device_attribute_list(): device " << device;
		WARN_STREAM << " wildcard " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		attribute = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT attribute FROM property_attribute_device WHERE device=\"" << device
		<< "\" AND attribute LIKE \"" << tmp_wildcard << "\" ORDER BY attribute";
		<< "\" AND attribute LIKE \"" << attribute << "\" ORDER BY attribute";

		DEBUG_STREAM << "DataBase::db_get_device_attrribute_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -3777,7 +3777,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_domain_list(Tango::DevString a

		Tango::DevString wildcard = argin;
		TangoSys_MemStream sql_query_stream;
		std::string tmp_wildcard;
		std::string device;
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;
		@@ -3787,9 +3787,9 @@ Tango::DevVarStringArray *DataBase::db_get_device_domain_list(Tango::DevString a

		INFO_STREAM << "DataBase::db_get_device_domain_list(): wild card " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT domain FROM device WHERE name LIKE \"" << tmp_wildcard << "\" OR alias LIKE \""
		<< tmp_wildcard << "\" ORDER BY domain";
		device = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT domain FROM device WHERE name LIKE \"" << device << "\" OR alias LIKE \""
		<< device << "\" ORDER BY domain";

		DEBUG_STREAM << "DataBase::db_get_device_domain_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -3912,7 +3912,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_family_list(Tango::DevString a

		Tango::DevString wildcard = argin;
		TangoSys_MemStream sql_query_stream;
		std::string tmp_wildcard;
		std::string device;
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;
		@@ -3922,9 +3922,9 @@ Tango::DevVarStringArray *DataBase::db_get_device_family_list(Tango::DevString a

		INFO_STREAM << "DataBase::db_get_device_family_list(): wild card " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT family FROM device WHERE name LIKE \"" << tmp_wildcard << "\" OR alias LIKE \""
		<< tmp_wildcard << "\" ORDER BY family";
		device = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT family FROM device WHERE name LIKE \"" << device << "\" OR alias LIKE \""
		<< device << "\" ORDER BY family";

		DEBUG_STREAM << "DataBase::db_get_device_family_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -4279,7 +4279,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_member_list(Tango::DevString a

		Tango::DevString wildcard = argin;
		TangoSys_MemStream sql_query_stream;
		std::string tmp_wildcard;
		std::string device;
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;
		@@ -4289,9 +4289,9 @@ Tango::DevVarStringArray *DataBase::db_get_device_member_list(Tango::DevString a

		INFO_STREAM << "DataBase::db_get_device_member_list(): wild card " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT member FROM device WHERE name LIKE \"" << tmp_wildcard << "\" OR alias LIKE \""
		<< tmp_wildcard << "\" ORDER BY member";
		device = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT member FROM device WHERE name LIKE \"" << device << "\" OR alias LIKE \""
		<< device << "\" ORDER BY member";

		DEBUG_STREAM << "DataBase::db_get_device_member_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -4564,7 +4564,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_property_list(const Tango::Dev
		MYSQL_ROW row;
		int n_rows;
		const char device, wildcard;
		std::string tmp_wildcard;
		std::string property;

		TimeVal before, after;
		GetTime(before);
		@@ -4574,9 +4574,9 @@ Tango::DevVarStringArray *DataBase::db_get_device_property_list(const Tango::Dev
		INFO_STREAM << "DataBase::db_get_device_property_list(): device " << device;
		INFO_STREAM << " wildcard " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		property = replace_wildcard(wildcard);
		sql_query_stream << "SELECT name FROM property_device WHERE device=\"" << device << "\" AND name LIKE \""
		<< tmp_wildcard << "\" AND count=1 ORDER BY name";
		<< property << "\" AND count=1 ORDER BY name";

		DEBUG_STREAM << "DataBase::db_get_device_property_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -4754,7 +4754,7 @@ Tango::DevVarStringArray *DataBase::db_get_host_list(Tango::DevString argin)

		Tango::DevString wildcard = argin;
		TangoSys_MemStream sql_query_stream;
		std::string tmp_wildcard;
		std::string host;
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;
		@@ -4764,8 +4764,8 @@ Tango::DevVarStringArray *DataBase::db_get_host_list(Tango::DevString argin)

		INFO_STREAM << "DataBase::db_get_host_list(): wild card " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT host FROM device WHERE host LIKE \"" << tmp_wildcard << "\" ORDER BY host";
		host = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT host FROM device WHERE host LIKE \"" << host << "\" ORDER BY host";

		DEBUG_STREAM << "DataBase::db_get_host_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -4821,7 +4821,7 @@ Tango::DevVarStringArray *DataBase::db_get_host_server_list(Tango::DevString arg

		Tango::DevString wildcard = argin;
		TangoSys_MemStream sql_query_stream;
		std::string tmp_wildcard;
		std::string host;
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;
		@@ -4831,11 +4831,11 @@ Tango::DevVarStringArray *DataBase::db_get_host_server_list(Tango::DevString arg

		INFO_STREAM << "DataBase::db_get_host_server_list(): wild card " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		host = replace_wildcard(wildcard);
		// For compatibility reason between before and after Tang-5.2
		// Will check with and without Fully Qualify Domain Name.
		sql_query_stream << "SELECT DISTINCT server FROM device WHERE (host LIKE \"" << tmp_wildcard << "\" or host LIKE \""
		<< tmp_wildcard << ".%%\") AND name LIKE \"dserver/%%\" ORDER BY server";
		sql_query_stream << "SELECT DISTINCT server FROM device WHERE (host LIKE \"" << host << "\" or host LIKE \"" << host
		<< ".%%\") AND name LIKE \"dserver/%%\" ORDER BY server";

		DEBUG_STREAM << "DataBase::db_get_host_server_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -4986,13 +4986,12 @@ Tango::DevVarStringArray *DataBase::db_get_object_list(Tango::DevString argin)
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;
		std::string tmp_wildcard;
		std::string object;

		INFO_STREAM << "DataBase::db_get_object_list(): object " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT object FROM property WHERE object LIKE \"" << tmp_wildcard
		<< "\" ORDER BY object";
		object = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT object FROM property WHERE object LIKE \"" << object << "\" ORDER BY object";

		DEBUG_STREAM << "DataBase::db_get_object_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -5247,7 +5246,7 @@ Tango::DevVarStringArray *DataBase::db_get_property_list(const Tango::DevVarStri
		MYSQL_ROW row;
		int n_rows;
		const char object, wildcard;
		std::string tmp_wildcard;
		std::string property;

		if(object_wildcard->length() != 2)
		{
		@@ -5261,9 +5260,9 @@ Tango::DevVarStringArray *DataBase::db_get_property_list(const Tango::DevVarStri

		INFO_STREAM << "DataBase::db_get_property_list(): object " << object << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		property = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT name FROM property WHERE object LIKE \"" << object << "\" AND name LIKE \""
		<< tmp_wildcard << "\" ORDER BY name";
		<< property << "\" ORDER BY name";

		DEBUG_STREAM << "DataBase::db_get_property_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -8320,12 +8319,12 @@ void DataBase::db_delete_device_pipe(const Tango::DevVarStringArray *argin)

		// replace database wildcards (% and _)

		std::string tmp_wildcard = replace_wildcard(device.c_str());
		std::string device_resolved = replace_wildcard(device.c_str());

		// then delete device from the property_attribute_device table
		DatabaseConnectionHandle dch(dcp);
		sql_query_stream << "DELETE FROM property_pipe_device WHERE device LIKE \"" << tmp_wildcard << "\" AND pipe LIKE \""
		<< pipe << "\" ";
		sql_query_stream << "DELETE FROM property_pipe_device WHERE device LIKE \"" << device_resolved
		<< "\" AND pipe LIKE \"" << pipe << "\" ";
		DEBUG_STREAM << "DataBase::db_delete_device_pipe(): sql_query " << sql_query_stream.str() << std::endl;
		simple_query(sql_query_stream.str(), "db_delete_device_pipe()", dch);

		@@ -8542,16 +8541,16 @@ Tango::DevVarStringArray *DataBase::db_get_class_pipe_list(const Tango::DevVarSt
		int n_rows = 0;
		argout = new Tango::DevVarStringArray;
		const char class_name, wildcard;
		std::string tmp_wildcard;
		std::string pipe;

		class_name = (*class_wildcard)[0];
		INFO_STREAM << "DataBase::db_get_class_pipe_list(): get pipes for class " << class_name << std::endl;

		wildcard = (*class_wildcard)[1];

		tmp_wildcard = replace_wildcard(wildcard);
		pipe = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT pipe FROM property_pipe_class WHERE class = \"" << class_name
		<< "\" AND pipe like \"" << tmp_wildcard << "\"";
		<< "\" AND pipe like \"" << pipe << "\"";

		DEBUG_STREAM << "DataBase::DbGetClassPipeList(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -8601,7 +8600,7 @@ Tango::DevVarStringArray *DataBase::db_get_device_pipe_list(const Tango::DevVarS

		const Tango::DevVarStringArray *device_wildcard = argin;
		TangoSys_MemStream sql_query_stream;
		std::string tmp_wildcard;
		std::string pipe;
		MYSQL_RES *result;
		MYSQL_ROW row;
		int n_rows;
		@@ -8612,9 +8611,9 @@ Tango::DevVarStringArray *DataBase::db_get_device_pipe_list(const Tango::DevVarS
		INFO_STREAM << "DataBase::db_get_device_pipe_list(): device " << device;
		WARN_STREAM << " wildcard " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		pipe = replace_wildcard(wildcard);
		sql_query_stream << "SELECT DISTINCT pipe FROM property_pipe_device WHERE device=\"" << device
		<< "\" AND pipe LIKE \"" << tmp_wildcard << "\" ORDER BY pipe";
		<< "\" AND pipe LIKE \"" << pipe << "\" ORDER BY pipe";

		DEBUG_STREAM << "DataBase::db_get_device_attrribute_list(): sql_query " << sql_query_stream.str() << std::endl;

		@@ -9221,7 +9220,7 @@ Tango::DevVarStringArray *DataBase::db_get_class_property_list_wildcard(const Ta
		MYSQL_ROW row;
		int n_rows;
		const char class_name, wildcard;
		std::string tmp_wildcard;
		std::string property;

		TimeVal before, after;
		GetTime(before);
		@@ -9231,9 +9230,9 @@ Tango::DevVarStringArray *DataBase::db_get_class_property_list_wildcard(const Ta
		INFO_STREAM << "DataBase::db_get_class_property_list_wildcard(): class_name " << class_name;
		INFO_STREAM << " wildcard " << wildcard << std::endl;

		tmp_wildcard = replace_wildcard(wildcard);
		property = replace_wildcard(wildcard);
		sql_query_stream << "SELECT name FROM property_class WHERE class=\"" << class_name << "\" AND name LIKE \""
		<< tmp_wildcard << "\" AND count=1 ORDER BY name";
		<< property << "\" AND count=1 ORDER BY name";

		DEBUG_STREAM << "DataBase::db_get_class_property_list_wildcard(): sql_query " << sql_query_stream.str()
		<< std::endl;