1 files changed, 33 insertions, 2 deletions

diff --git a/src/components/policy/policy_regular/include/policy/sql_pt_representation.h b/src/components/policy/policy_regular/include/policy/sql_pt_representation.h
index dfa318454b..216598850e 100644
--- a/src/components/policy/policy_regular/include/policy/sql_pt_representation.h
+++ b/src/components/policy/policy_regular/include/policy/sql_pt_representation.h
@@ -35,15 +35,16 @@
 
 #include <string>
 #include <vector>
+#include "policy/policy_table/types.h"
 #include "policy/pt_representation.h"
 #include "rpc_base/rpc_base.h"
-#include "policy/policy_table/types.h"
 
 namespace policy_table = rpc::policy_table_interface_base;
 
 namespace utils {
 namespace dbms {
 class SQLDatabase;
+class SQLQuery;
 }  // namespace dbms
 }  // namespace utils
 
@@ -69,7 +70,6 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   virtual int TimeoutResponse();
   virtual bool SecondsBetweenRetries(std::vector<int>* seconds);
   virtual bool RefreshDB();
-  virtual const VehicleInfo GetVehicleInfo() const;
 
   virtual std::vector<UserFriendlyMessage> GetUserFriendlyMsg(
       const std::vector<std::string>& msg_codes, const std::string& language);
@@ -123,6 +123,9 @@ class SQLPTRepresentation : public virtual PTRepresentation {
       policy_table::ConsumerFriendlyMessages* messages) const;
   virtual bool GatherApplicationPoliciesSection(
       policy_table::ApplicationPoliciesSection* policies) const;
+  virtual bool GatherVehicleDataItems(
+      policy_table::VehicleDataItems* vehicle_data_items) const;
+  virtual bool GatherVehicleData(policy_table::VehicleData* vehicle_data) const;
 
   bool GatherAppGroup(const std::string& app_id,
                       policy_table::Strings* app_groups) const;
@@ -159,6 +162,9 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   virtual bool SaveSpecificAppPolicy(
       const policy_table::ApplicationPolicies::value_type& app);
   virtual bool SaveDevicePolicy(const policy_table::DevicePolicy& device);
+  virtual bool SaveVehicleDataItems(
+      const policy_table::VehicleDataItems& vehicle_data_items);
+  virtual bool SaveVehicleData(const policy_table::VehicleData& vehicle_data);
 
   virtual bool SaveMessageString(const std::string& type,
                                  const std::string& lang,
@@ -202,6 +208,26 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   virtual bool IsDBVersionActual() const OVERRIDE;
   virtual bool UpdateDBVersion() const OVERRIDE;
 
+  policy_table::VehicleDataItems GetVehicleDataItem(
+      const std::string& name, const std::string& key) const;
+  bool InsertVehicleDataItem(
+      const policy_table::VehicleDataItem& vehicle_data_item);
+  bool VehicleDataItemExists(
+      const policy_table::VehicleDataItem& vehicle_data_item) const;
+
+  /**
+   * @brief Retrieves vehicle data items of type Struct (which contains
+   * params) from the database including these parameters.
+   * @return Array of composite VehicleDataItems
+   */
+  policy_table::VehicleDataItems SelectCompositeVehicleDataItems() const;
+
+  /**
+   * @brief Retrieves vehicle data items of non Struct type from the database.
+   * @return Array of primitive VehicleDataItems
+   */
+  policy_table::VehicleDataItems SelectPrimitiveVehicleDataItems() const;
+
  private:
   static const std::string kDatabaseName;
   utils::dbms::SQLDatabase* db_;
@@ -217,12 +243,17 @@ class SQLPTRepresentation : public virtual PTRepresentation {
   const int32_t GetDBVersion() const;
   bool SaveRpcs(int64_t group_id, const policy_table::Rpc& rpcs);
   bool SaveServiceEndpoints(const policy_table::ServiceEndpoints& endpoints);
+  bool SaveServiceEndpointProperties(
+      const policy_table::ServiceEndpointProperties& endpoint_properties);
   bool SaveSecondsBetweenRetries(
       const policy_table::SecondsBetweenRetries& seconds);
   bool SaveNumberOfNotificationsPerMinute(
       const policy_table::NumberOfNotificationsPerMinute& notifications);
   bool SaveMessageType(const std::string& type);
   bool SaveLanguage(const std::string& code);
+  policy_table::VehicleDataItem PopulateVDIFromQuery(
+      const utils::dbms::SQLQuery& query) const;
+  bool DeleteVehicleDataItems() const;
 
   bool is_in_memory;
 };