Fixes Brave Ads fails to upgrade segment database table from 1.19.x to 1.20.x and above - 1.20.x

components/brave_ads/test/BUILD.gn

@@ -42,12 +42,18 @@ source_set("brave_ads_unit_tests") {
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/container_util_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/conversions/sorts/conversions_sort_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/ad_events_database_table_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/campaigns_database_table_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/conversions_database_table_test.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/conversions_database_table_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ad_notifications_database_table_test.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ad_notifications_database_table_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ads_database_table_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_new_tab_page_ads_database_table_test.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_new_tab_page_ads_database_table_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/dayparts_database_table_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/geo_targets_database_table_unittest.cc",
+      "//brave/vendor/bat-native-ads/src/bat/ads/internal/database/tables/segments_database_table_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/eligible_ads/ad_notifications/eligible_ad_notifications_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/features/bandits/epsilon_greedy_bandit_features_unittest.cc",
       "//brave/vendor/bat-native-ads/src/bat/ads/internal/features/purchase_intent/purchase_intent_features_unittest.cc",

vendor/bat-native-ads/src/bat/ads/internal/database/tables/ad_events_database_table_unittest.cc

@@ -0,0 +1,40 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "bat/ads/internal/database/tables/ad_events_database_table.h"
+
+#include <memory>
+
+#include "bat/ads/internal/unittest_base.h"
+#include "bat/ads/internal/unittest_util.h"
+
+// npm run test -- brave_unit_tests --filter=BatAds*
+
+namespace ads {
+
+class BatAdsAdEventsDatabaseTableTest : public UnitTestBase {
+ protected:
+  BatAdsAdEventsDatabaseTableTest()
+      : database_table_(std::make_unique<database::table::AdEvents>()) {
+  }
+
+  ~BatAdsAdEventsDatabaseTableTest() override = default;
+
+  std::unique_ptr<database::table::AdEvents> database_table_;
+};
+
+TEST_F(BatAdsAdEventsDatabaseTableTest,
+    TableName) {
+  // Arrange
+
+  // Act
+  const std::string table_name = database_table_->get_table_name();
+
+  // Assert
+  const std::string expected_table_name = "ad_events";
+  EXPECT_EQ(expected_table_name, table_name);
+}
+
+}  // namespace ads

vendor/bat-native-ads/src/bat/ads/internal/database/tables/campaigns_database_table_unittest.cc

@@ -0,0 +1,40 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "bat/ads/internal/database/tables/campaigns_database_table.h"
+
+#include <memory>
+
+#include "bat/ads/internal/unittest_base.h"
+#include "bat/ads/internal/unittest_util.h"
+
+// npm run test -- brave_unit_tests --filter=BatAds*
+
+namespace ads {
+
+class BatAdsCampaignsDatabaseTableTest : public UnitTestBase {
+ protected:
+  BatAdsCampaignsDatabaseTableTest()
+      : database_table_(std::make_unique<database::table::Campaigns>()) {
+  }
+
+  ~BatAdsCampaignsDatabaseTableTest() override = default;
+
+  std::unique_ptr<database::table::Campaigns> database_table_;
+};
+
+TEST_F(BatAdsCampaignsDatabaseTableTest,
+    TableName) {
+  // Arrange
+
+  // Act
+  const std::string table_name = database_table_->get_table_name();
+
+  // Assert
+  const std::string expected_table_name = "campaigns";
+  EXPECT_EQ(expected_table_name, table_name);
+}
+
+}  // namespace ads

vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ads_database_table_unittest.cc

@@ -0,0 +1,40 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "bat/ads/internal/database/tables/creative_ads_database_table.h"
+
+#include <memory>
+
+#include "bat/ads/internal/unittest_base.h"
+#include "bat/ads/internal/unittest_util.h"
+
+// npm run test -- brave_unit_tests --filter=BatAds*
+
+namespace ads {
+
+class BatAdsCreativeAdsDatabaseTableTest : public UnitTestBase {
+ protected:
+  BatAdsCreativeAdsDatabaseTableTest()
+      : database_table_(std::make_unique<database::table::CreativeAds>()) {
+  }
+
+  ~BatAdsCreativeAdsDatabaseTableTest() override = default;
+
+  std::unique_ptr<database::table::CreativeAds> database_table_;
+};
+
+TEST_F(BatAdsCreativeAdsDatabaseTableTest,
+    TableName) {
+  // Arrange
+
+  // Act
+  const std::string table_name = database_table_->get_table_name();
+
+  // Assert
+  const std::string expected_table_name = "creative_ads";
+  EXPECT_EQ(expected_table_name, table_name);
+}
+
+}  // namespace ads

vendor/bat-native-ads/src/bat/ads/internal/database/tables/dayparts_database_table_unittest.cc

@@ -0,0 +1,40 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "bat/ads/internal/database/tables/dayparts_database_table.h"
+
+#include <memory>
+
+#include "bat/ads/internal/unittest_base.h"
+#include "bat/ads/internal/unittest_util.h"
+
+// npm run test -- brave_unit_tests --filter=BatAds*
+
+namespace ads {
+
+class BatAdsDayPartsDatabaseTableTest : public UnitTestBase {
+ protected:
+  BatAdsDayPartsDatabaseTableTest()
+      : database_table_(std::make_unique<database::table::Dayparts>()) {
+  }
+
+  ~BatAdsDayPartsDatabaseTableTest() override = default;
+
+  std::unique_ptr<database::table::Dayparts> database_table_;
+};
+
+TEST_F(BatAdsDayPartsDatabaseTableTest,
+    TableName) {
+  // Arrange
+
+  // Act
+  const std::string table_name = database_table_->get_table_name();
+
+  // Assert
+  const std::string expected_table_name = "dayparts";
+  EXPECT_EQ(expected_table_name, table_name);
+}
+
+}  // namespace ads

vendor/bat-native-ads/src/bat/ads/internal/database/tables/geo_targets_database_table_unittest.cc

@@ -0,0 +1,40 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "bat/ads/internal/database/tables/geo_targets_database_table.h"
+
+#include <memory>
+
+#include "bat/ads/internal/unittest_base.h"
+#include "bat/ads/internal/unittest_util.h"
+
+// npm run test -- brave_unit_tests --filter=BatAds*
+
+namespace ads {
+
+class BatAdsGeoTargetsDatabaseTableTest : public UnitTestBase {
+ protected:
+  BatAdsGeoTargetsDatabaseTableTest()
+      : database_table_(std::make_unique<database::table::GeoTargets>()) {
+  }
+
+  ~BatAdsGeoTargetsDatabaseTableTest() override = default;
+
+  std::unique_ptr<database::table::GeoTargets> database_table_;
+};
+
+TEST_F(BatAdsGeoTargetsDatabaseTableTest,
+    TableName) {
+  // Arrange
+
+  // Act
+  const std::string table_name = database_table_->get_table_name();
+
+  // Assert
+  const std::string expected_table_name = "geo_targets";
+  EXPECT_EQ(expected_table_name, table_name);
+}
+
+}  // namespace ads

vendor/bat-native-ads/src/bat/ads/internal/database/tables/segments_database_table.cc

@@ -130,7 +130,7 @@ void Segments::MigrateToV8(
     DBTransaction* transaction) {
   DCHECK(transaction);
 
-  util::Drop(transaction, "categories");
+  util::Drop(transaction, get_table_name());
 
   CreateTableV8(transaction);
 }

vendor/bat-native-ads/src/bat/ads/internal/database/tables/segments_database_table_unittest.cc

@@ -0,0 +1,40 @@
+/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "bat/ads/internal/database/tables/segments_database_table.h"
+
+#include <memory>
+
+#include "bat/ads/internal/unittest_base.h"
+#include "bat/ads/internal/unittest_util.h"
+
+// npm run test -- brave_unit_tests --filter=BatAds*
+
+namespace ads {
+
+class BatAdsSegmentsDatabaseTableTest : public UnitTestBase {
+ protected:
+  BatAdsSegmentsDatabaseTableTest()
+      : database_table_(std::make_unique<database::table::Segments>()) {
+  }
+
+  ~BatAdsSegmentsDatabaseTableTest() override = default;
+
+  std::unique_ptr<database::table::Segments> database_table_;
+};
+
+TEST_F(BatAdsSegmentsDatabaseTableTest,
+    TableName) {
+  // Arrange
+
+  // Act
+  const std::string table_name = database_table_->get_table_name();
+
+  // Assert
+  const std::string expected_table_name = "segments";
+  EXPECT_EQ(expected_table_name, table_name);
+}
+
+}  // namespace ads