Commit ba373553 authored by Becca Hughes's avatar Becca Hughes Committed by Commit Bot

[Media History] Use unique index names

Index names are at the DB level and some of them
are duplicated so this prefixes them all with
the table name.

BUG=1024351

Change-Id: I9e8ba700625e9d2c42f2fbeaab3ba216f450f0a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2129898Reviewed-by: default avatarTommy Steimel <steimel@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755094}
parent d200279c
...@@ -158,7 +158,7 @@ sql::InitStatus MediaHistoryFeedItemsTable::CreateTableIfNonExistent() { ...@@ -158,7 +158,7 @@ sql::InitStatus MediaHistoryFeedItemsTable::CreateTableIfNonExistent() {
if (success) { if (success) {
success = DB()->Execute( success = DB()->Execute(
"CREATE INDEX IF NOT EXISTS media_feed_item_feed_id_index ON " "CREATE INDEX IF NOT EXISTS mediaFeedItem_feed_id_index ON "
"mediaFeedItem (feed_id)"); "mediaFeedItem (feed_id)");
} }
......
...@@ -65,7 +65,7 @@ sql::InitStatus MediaHistoryFeedsTable::CreateTableIfNonExistent() { ...@@ -65,7 +65,7 @@ sql::InitStatus MediaHistoryFeedsTable::CreateTableIfNonExistent() {
if (success) { if (success) {
success = DB()->Execute( success = DB()->Execute(
base::StringPrintf( base::StringPrintf(
"CREATE INDEX IF NOT EXISTS media_feed_origin_id_index ON " "CREATE INDEX IF NOT EXISTS mediaFeed_origin_id_index ON "
"%s (origin_id)", "%s (origin_id)",
kTableName) kTableName)
.c_str()); .c_str());
......
...@@ -40,7 +40,7 @@ sql::InitStatus MediaHistoryImagesTable::CreateTableIfNonExistent() { ...@@ -40,7 +40,7 @@ sql::InitStatus MediaHistoryImagesTable::CreateTableIfNonExistent() {
if (success) { if (success) {
success = DB()->Execute( success = DB()->Execute(
base::StringPrintf( base::StringPrintf(
"CREATE INDEX IF NOT EXISTS playback_origin_id_index ON " "CREATE INDEX IF NOT EXISTS mediaImage_playback_origin_id_index ON "
"%s (playback_origin_id)", "%s (playback_origin_id)",
kTableName) kTableName)
.c_str()); .c_str());
...@@ -48,10 +48,10 @@ sql::InitStatus MediaHistoryImagesTable::CreateTableIfNonExistent() { ...@@ -48,10 +48,10 @@ sql::InitStatus MediaHistoryImagesTable::CreateTableIfNonExistent() {
if (success) { if (success) {
success = DB()->Execute( success = DB()->Execute(
base::StringPrintf( base::StringPrintf("CREATE UNIQUE INDEX IF NOT EXISTS "
"CREATE UNIQUE INDEX IF NOT EXISTS image_origin_url_index ON " "mediaImage_playback_origin_id_url_index ON "
"%s (playback_origin_id, url)", "%s (playback_origin_id, url)",
kTableName) kTableName)
.c_str()); .c_str());
} }
......
...@@ -43,9 +43,10 @@ sql::InitStatus MediaHistoryPlaybackTable::CreateTableIfNonExistent() { ...@@ -43,9 +43,10 @@ sql::InitStatus MediaHistoryPlaybackTable::CreateTableIfNonExistent() {
if (success) { if (success) {
success = DB()->Execute( success = DB()->Execute(
base::StringPrintf("CREATE INDEX IF NOT EXISTS origin_id_index ON " base::StringPrintf(
"%s (origin_id)", "CREATE INDEX IF NOT EXISTS playback_origin_id_index ON "
kTableName) "%s (origin_id)",
kTableName)
.c_str()); .c_str());
} }
......
...@@ -48,26 +48,28 @@ sql::InitStatus MediaHistorySessionImagesTable::CreateTableIfNonExistent() { ...@@ -48,26 +48,28 @@ sql::InitStatus MediaHistorySessionImagesTable::CreateTableIfNonExistent() {
if (success) { if (success) {
success = DB()->Execute( success = DB()->Execute(
base::StringPrintf("CREATE INDEX IF NOT EXISTS session_id_index ON " base::StringPrintf(
"%s (session_id)", "CREATE INDEX IF NOT EXISTS sessionImage_session_id_index ON "
kTableName) "%s (session_id)",
kTableName)
.c_str()); .c_str());
} }
if (success) { if (success) {
success = DB()->Execute( success = DB()->Execute(
base::StringPrintf("CREATE INDEX IF NOT EXISTS image_id_index ON " base::StringPrintf(
"%s (image_id)", "CREATE INDEX IF NOT EXISTS sessionImage_image_id_index ON "
kTableName) "%s (image_id)",
kTableName)
.c_str()); .c_str());
} }
if (success) { if (success) {
success = DB()->Execute( success = DB()->Execute(
base::StringPrintf( base::StringPrintf("CREATE UNIQUE INDEX IF NOT EXISTS "
"CREATE UNIQUE INDEX IF NOT EXISTS session_image_index ON " "sessionImage_session_image_index ON "
"%s (session_id, image_id, width, height)", "%s (session_id, image_id, width, height)",
kTableName) kTableName)
.c_str()); .c_str());
} }
......
...@@ -51,9 +51,10 @@ sql::InitStatus MediaHistorySessionTable::CreateTableIfNonExistent() { ...@@ -51,9 +51,10 @@ sql::InitStatus MediaHistorySessionTable::CreateTableIfNonExistent() {
if (success) { if (success) {
success = DB()->Execute( success = DB()->Execute(
base::StringPrintf("CREATE INDEX IF NOT EXISTS origin_id_index ON " base::StringPrintf(
"%s (origin_id)", "CREATE INDEX IF NOT EXISTS playbackSession_origin_id_index ON "
kTableName) "%s (origin_id)",
kTableName)
.c_str()); .c_str());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment