https://telecominfraproject.atlassian.net/browse/WIFI-13147

Signed-off-by: stephb9959 <[email protected]>
Telecominfraproject · Nov 24, 2023 · 3f60c5a · 3f60c5a
1 parent d85fb32
commit 3f60c5a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/build b/build
@@ -1 +1 @@
-9
+10
diff --git a/src/storage/storage_device.cpp b/src/storage/storage_device.cpp
@@ -392,11 +392,11 @@ namespace OpenWifi {
 
 			std::string St{"SELECT SerialNumber FROM Devices WHERE SerialNumber=?"};
 
-			Select << ConvertParams(St), Poco::Data::Keywords::into(SerialNumber),
-				Poco::Data::Keywords::use(DeviceDetails.SerialNumber);
-			Select.execute();
+//			Select << ConvertParams(St), Poco::Data::Keywords::into(SerialNumber),
+//				Poco::Data::Keywords::use(DeviceDetails.SerialNumber);
+//			Select.execute();
 
-			if (Select.rowsExtracted() == 0) {
+//			if (Select.rowsExtracted() == 0) {
 				Config::Config Cfg(DeviceDetails.Configuration);
 				uint64_t Now = Utils::Now();
 
@@ -410,7 +410,7 @@ namespace OpenWifi {
 					Poco::Data::Statement Insert(Sess);
 
 					std::string St2{"INSERT INTO Devices ( " + DB_DeviceSelectFields + " ) " +
-									DB_DeviceInsertValues};
+									DB_DeviceInsertValues + " ON CONFLICT (SerialNumber) DO NOTHING"};
 
 					SetCurrentConfigurationID(DeviceDetails.SerialNumber, DeviceDetails.UUID);
 					DeviceRecordTuple R;
@@ -424,11 +424,11 @@ namespace OpenWifi {
 					poco_warning(Logger(), "Cannot create device: invalid configuration.");
 					return false;
 				}
-			} else {
-				poco_warning(Logger(), fmt::format("Device {} already exists.", SerialNumber));
-				return false;
-			}
-
+//			} else {
+//				poco_warning(Logger(), fmt::format("Device {} already exists.", SerialNumber));
+//				return false;
+//			}
+			return true;
 		} catch (const Poco::Exception &E) {
 			Logger().log(E);
 		}

diff --git a/src/storage/storage_tables.cpp b/src/storage/storage_tables.cpp
@@ -40,12 +40,15 @@ namespace OpenWifi {
 				Sess << "CREATE INDEX IF NOT EXISTS StatsSerial ON Statistics (SerialNumber ASC, "
 						"Recorded ASC)",
 					Poco::Data::Keywords::now;
+				Sess << "CREATE INDEX IF NOT EXISTS StatsSerial0 ON Statistics (SerialNumber ASC)",
+					Poco::Data::Keywords::now;
 			} else if (dbType_ == mysql) {
 				Sess << "CREATE TABLE IF NOT EXISTS Statistics ("
 						"SerialNumber VARCHAR(30), "
 						"UUID INTEGER, "
 						"Data TEXT, "
 						"Recorded BIGINT, "
+						"INDEX StatSerial0 (SerialNumber)), ",
 						"INDEX StatSerial (SerialNumber ASC, Recorded ASC))",
 					Poco::Data::Keywords::now;
 			}