Merge pull request #70 from c-jimenez/fix/raspberry_build

c-jimenez · web-flow · commit edb760e41fce · 2022-09-25T14:59:35.000+02:00
[db] For casting time_t to int64_t to ensure compilation on systems where time_t is a 32bits integer
diff --git a/src/chargepoint/authent/AuthentCache.cpp b/src/chargepoint/authent/AuthentCache.cpp
@@ -175,7 +175,7 @@ void AuthentCache::update(const std::string& id_tag, const ocpp::types::IdTagInf
                     }
                     if (tag_info.expiryDate.isSet())
                     {
-                        m_update_query->bind(1, tag_info.expiryDate.value().timestamp());
+                        m_update_query->bind(1, static_cast<int64_t>(tag_info.expiryDate.value().timestamp()));
                     }
                     else
                     {
@@ -209,7 +209,7 @@ void AuthentCache::update(const std::string& id_tag, const ocpp::types::IdTagInf
                     }
                     if (tag_info.expiryDate.isSet())
                     {
-                        m_insert_query->bind(2, tag_info.expiryDate.value().timestamp());
+                        m_insert_query->bind(2, static_cast<int64_t>(tag_info.expiryDate.value().timestamp()));
                     }
                     else
                     {
diff --git a/src/chargepoint/authent/AuthentLocalList.cpp b/src/chargepoint/authent/AuthentLocalList.cpp
@@ -312,7 +312,7 @@ bool AuthentLocalList::performFullUpdate(const std::vector<ocpp::types::Authoriz
                 }
                 if (authorization_data.idTagInfo.value().expiryDate.isSet())
                 {
-                    m_insert_query->bind(2, authorization_data.idTagInfo.value().expiryDate.value().timestamp());
+                    m_insert_query->bind(2, static_cast<int64_t>(authorization_data.idTagInfo.value().expiryDate.value().timestamp()));
                 }
                 else
                 {
@@ -375,7 +375,8 @@ bool AuthentLocalList::performPartialUpdate(const std::vector<ocpp::types::Autho
                         m_update_query->bind(0, authorization_data.idTagInfo.value().parentIdTag.value());
                         if (authorization_data.idTagInfo.value().expiryDate.isSet())
                         {
-                            m_update_query->bind(1, authorization_data.idTagInfo.value().expiryDate.value().timestamp());
+                            m_update_query->bind(1,
+                                                 static_cast<int64_t>(authorization_data.idTagInfo.value().expiryDate.value().timestamp()));
                         }
                         else
                         {
@@ -400,7 +401,8 @@ bool AuthentLocalList::performPartialUpdate(const std::vector<ocpp::types::Autho
                         m_insert_query->bind(1, authorization_data.idTagInfo.value().parentIdTag.value());
                         if (authorization_data.idTagInfo.value().expiryDate.isSet())
                         {
-                            m_insert_query->bind(2, authorization_data.idTagInfo.value().expiryDate.value().timestamp());
+                            m_insert_query->bind(2,
+                                                 static_cast<int64_t>(authorization_data.idTagInfo.value().expiryDate.value().timestamp()));
                         }
                         else
                         {
diff --git a/src/chargepoint/connector/Connectors.cpp b/src/chargepoint/connector/Connectors.cpp
@@ -278,13 +278,13 @@ bool Connectors::saveConnector(const Connector& connector)
         m_update_query->bind(1u, static_cast<int>(connector.last_notified_status));
         m_update_query->bind(2u, connector.transaction_id);
         m_update_query->bind(3u, connector.transaction_id_offline);
-        m_update_query->bind(4u, connector.transaction_start);
+        m_update_query->bind(4u, static_cast<int64_t>(connector.transaction_start));
         m_update_query->bind(5u, connector.transaction_id_tag);
         m_update_query->bind(6u, connector.transaction_parent_id_tag);
         m_update_query->bind(7u, connector.reservation_id);
         m_update_query->bind(8u, connector.reservation_id_tag);
         m_update_query->bind(9u, connector.reservation_parent_id_tag);
-        m_update_query->bind(10u, connector.reservation_expiry_date);
+        m_update_query->bind(10u, static_cast<int64_t>(connector.reservation_expiry_date));
         m_update_query->bind(11u, connector.id);
         ret = m_update_query->exec();
         if (ret)
@@ -313,13 +313,13 @@ bool Connectors::createConnector(const Connector& connector)
         m_insert_query->bind(2u, static_cast<int>(connector.last_notified_status));
         m_insert_query->bind(3u, connector.transaction_id);
         m_insert_query->bind(4u, connector.transaction_id_offline);
-        m_insert_query->bind(5u, connector.transaction_start);
+        m_insert_query->bind(5u, static_cast<int64_t>(connector.transaction_start));
         m_insert_query->bind(6u, connector.transaction_id_tag);
         m_insert_query->bind(7u, connector.transaction_parent_id_tag);
         m_insert_query->bind(8u, connector.reservation_id);
         m_insert_query->bind(9u, connector.reservation_id_tag);
         m_insert_query->bind(10u, connector.reservation_parent_id_tag);
-        m_insert_query->bind(11u, connector.reservation_expiry_date);
+        m_insert_query->bind(11u, static_cast<int64_t>(connector.reservation_expiry_date));
         ret = m_insert_query->exec();
         if (ret)
         {
diff --git a/src/chargepoint/security/CaCertificatesDatabase.cpp b/src/chargepoint/security/CaCertificatesDatabase.cpp
@@ -146,7 +146,7 @@ void CaCertificatesDatabase::getCertificateList(ocpp::types::CertificateUseEnumT
         // List certificates
         m_list_query->reset();
         m_list_query->bind(0, static_cast<unsigned int>(type));
-        m_list_query->bind(1, std::numeric_limits<std::time_t>::max());
+        m_list_query->bind(1, static_cast<int64_t>(std::numeric_limits<std::time_t>::max()));
         m_list_query->bind(2, 0);
         if (m_list_query->exec() && m_list_query->hasRows())
         {
@@ -177,8 +177,8 @@ std::string CaCertificatesDatabase::getCertificateListPem(ocpp::types::Certifica
         // List certificates
         m_list_query->reset();
         m_list_query->bind(0, static_cast<unsigned int>(type));
-        m_list_query->bind(1, DateTime::now().timestamp());
-        m_list_query->bind(2, DateTime::now().timestamp());
+        m_list_query->bind(1, static_cast<int64_t>(DateTime::now().timestamp()));
+        m_list_query->bind(2, static_cast<int64_t>(DateTime::now().timestamp()));
         if (m_list_query->exec() && m_list_query->hasRows())
         {
             // Read data
@@ -217,8 +217,8 @@ unsigned int CaCertificatesDatabase::getCertificateCount(ocpp::types::Certificat
         }
         m_count_query->reset();
         m_count_query->bind(0, static_cast<unsigned int>(type));
-        m_count_query->bind(1, validity_from);
-        m_count_query->bind(2, validity_to);
+        m_count_query->bind(1, static_cast<int64_t>(validity_from));
+        m_count_query->bind(2, static_cast<int64_t>(validity_to));
         if (m_count_query->exec() && m_count_query->hasRows())
         {
             // Read count
@@ -249,8 +249,8 @@ bool CaCertificatesDatabase::addCertificate(ocpp::types::CertificateUseEnumType
             // Add certificate
             m_insert_query->reset();
             m_insert_query->bind(0, static_cast<unsigned int>(type));
-            m_insert_query->bind(1, certificate.validityFrom());
-            m_insert_query->bind(2, certificate.validityTo());
+            m_insert_query->bind(1, static_cast<int64_t>(certificate.validityFrom()));
+            m_insert_query->bind(2, static_cast<int64_t>(certificate.validityTo()));
             m_insert_query->bind(3, hash_data.issuerNameHash);
             m_insert_query->bind(4, hash_data.issuerKeyHash);
             m_insert_query->bind(5, hash_data.serialNumber);
diff --git a/src/chargepoint/security/CpCertificatesDatabase.cpp b/src/chargepoint/security/CpCertificatesDatabase.cpp
@@ -150,8 +150,8 @@ bool CpCertificatesDatabase::installCertificate(unsigned int request_id, const o
     {
         // Install certificate
         m_update_csr_to_cert_query->reset();
-        m_update_csr_to_cert_query->bind(0, certificate.validityFrom());
-        m_update_csr_to_cert_query->bind(1, certificate.validityTo());
+        m_update_csr_to_cert_query->bind(0, static_cast<int64_t>(certificate.validityFrom()));
+        m_update_csr_to_cert_query->bind(1, static_cast<int64_t>(certificate.validityTo()));
         m_update_csr_to_cert_query->bind(2, certificate.pem());
         m_update_csr_to_cert_query->bind(3, request_id);
         if (m_update_csr_to_cert_query->exec())
@@ -179,8 +179,8 @@ bool CpCertificatesDatabase::isValidCertificateInstalled()
     {
         // Find valid certificates
         m_list_query->reset();
-        m_list_query->bind(0, DateTime::now().timestamp());
-        m_list_query->bind(1, DateTime::now().timestamp());
+        m_list_query->bind(0, static_cast<int64_t>(DateTime::now().timestamp()));
+        m_list_query->bind(1, static_cast<int64_t>(DateTime::now().timestamp()));
         ret = (m_list_query->exec() && m_list_query->hasRows());
 
         // Reset all queries
@@ -199,8 +199,8 @@ std::string CpCertificatesDatabase::getChargePointCertificate(std::string& priva
     {
         // Find valid certificates
         m_list_query->reset();
-        m_list_query->bind(0, DateTime::now().timestamp());
-        m_list_query->bind(1, DateTime::now().timestamp());
+        m_list_query->bind(0, static_cast<int64_t>(DateTime::now().timestamp()));
+        m_list_query->bind(1, static_cast<int64_t>(DateTime::now().timestamp()));
         if (m_list_query->exec() && m_list_query->hasRows())
         {
             // Get only the first = most recent
diff --git a/src/chargepoint/security/SecurityLogsDatabase.cpp b/src/chargepoint/security/SecurityLogsDatabase.cpp
@@ -48,7 +48,7 @@ bool SecurityLogsDatabase::log(const std::string& type, const std::string& messa
     if (m_insert_query)
     {
         m_insert_query->reset();
-        m_insert_query->bind(0, timestamp);
+        m_insert_query->bind(0, static_cast<int64_t>(timestamp));
         m_insert_query->bind(1, type);
         m_insert_query->bind(2, message);
         m_insert_query->bind(3, critical);
diff --git a/src/tools/log/LogDatabase.cpp b/src/tools/log/LogDatabase.cpp
@@ -43,7 +43,7 @@ void LogDatabase::log(std::time_t timestamp, unsigned int level, const std::stri
     if (m_insert_query)
     {
         m_insert_query->reset();
-        m_insert_query->bind(0, timestamp);
+        m_insert_query->bind(0, static_cast<int64_t>(timestamp));
         m_insert_query->bind(1, level);
         m_insert_query->bind(2, file);
         m_insert_query->bind(3, message);

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ void AuthentCache::update(const std::string& id_tag, const ocpp::types::IdTagInf`
`175`	`175`	`}`
`176`	`176`	`if (tag_info.expiryDate.isSet())`
`177`	`177`	`{`
`178`		`- m_update_query->bind(1, tag_info.expiryDate.value().timestamp());`
	`178`	`+ m_update_query->bind(1, static_cast<int64_t>(tag_info.expiryDate.value().timestamp()));`
`179`	`179`	`}`
`180`	`180`	`else`
`181`	`181`	`{`
`@@ -209,7 +209,7 @@ void AuthentCache::update(const std::string& id_tag, const ocpp::types::IdTagInf`
`209`	`209`	`}`
`210`	`210`	`if (tag_info.expiryDate.isSet())`
`211`	`211`	`{`
`212`		`- m_insert_query->bind(2, tag_info.expiryDate.value().timestamp());`
	`212`	`+ m_insert_query->bind(2, static_cast<int64_t>(tag_info.expiryDate.value().timestamp()));`
`213`	`213`	`}`
`214`	`214`	`else`
`215`	`215`	`{`
Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,7 @@ bool AuthentLocalList::performFullUpdate(const std::vector<ocpp::types::Authoriz`
`312`	`312`	`}`
`313`	`313`	`if (authorization_data.idTagInfo.value().expiryDate.isSet())`
`314`	`314`	`{`
`315`		`- m_insert_query->bind(2, authorization_data.idTagInfo.value().expiryDate.value().timestamp());`
	`315`	`+ m_insert_query->bind(2, static_cast<int64_t>(authorization_data.idTagInfo.value().expiryDate.value().timestamp()));`
`316`	`316`	`}`
`317`	`317`	`else`
`318`	`318`	`{`
`@@ -375,7 +375,8 @@ bool AuthentLocalList::performPartialUpdate(const std::vector<ocpp::types::Autho`
`375`	`375`	`m_update_query->bind(0, authorization_data.idTagInfo.value().parentIdTag.value());`
`376`	`376`	`if (authorization_data.idTagInfo.value().expiryDate.isSet())`
`377`	`377`	`{`
`378`		`- m_update_query->bind(1, authorization_data.idTagInfo.value().expiryDate.value().timestamp());`
	`378`	`+ m_update_query->bind(1,`
	`379`	`+ static_cast<int64_t>(authorization_data.idTagInfo.value().expiryDate.value().timestamp()));`
`379`	`380`	`}`
`380`	`381`	`else`
`381`	`382`	`{`
`@@ -400,7 +401,8 @@ bool AuthentLocalList::performPartialUpdate(const std::vector<ocpp::types::Autho`
`400`	`401`	`m_insert_query->bind(1, authorization_data.idTagInfo.value().parentIdTag.value());`
`401`	`402`	`if (authorization_data.idTagInfo.value().expiryDate.isSet())`
`402`	`403`	`{`
`403`		`- m_insert_query->bind(2, authorization_data.idTagInfo.value().expiryDate.value().timestamp());`
	`404`	`+ m_insert_query->bind(2,`
	`405`	`+ static_cast<int64_t>(authorization_data.idTagInfo.value().expiryDate.value().timestamp()));`
`404`	`406`	`}`
`405`	`407`	`else`
`406`	`408`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ bool SecurityLogsDatabase::log(const std::string& type, const std::string& messa`
`48`	`48`	`if (m_insert_query)`
`49`	`49`	`{`
`50`	`50`	`m_insert_query->reset();`
`51`		`- m_insert_query->bind(0, timestamp);`
	`51`	`+ m_insert_query->bind(0, static_cast<int64_t>(timestamp));`
`52`	`52`	`m_insert_query->bind(1, type);`
`53`	`53`	`m_insert_query->bind(2, message);`
`54`	`54`	`m_insert_query->bind(3, critical);`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void LogDatabase::log(std::time_t timestamp, unsigned int level, const std::stri`
`43`	`43`	`if (m_insert_query)`
`44`	`44`	`{`
`45`	`45`	`m_insert_query->reset();`
`46`		`- m_insert_query->bind(0, timestamp);`
	`46`	`+ m_insert_query->bind(0, static_cast<int64_t>(timestamp));`
`47`	`47`	`m_insert_query->bind(1, level);`
`48`	`48`	`m_insert_query->bind(2, file);`
`49`	`49`	`m_insert_query->bind(3, message);`