Kill gorp (#19786)

* Kill gorp

Gorp is dead. Long live Gorp.

```release-note
NONE
```

app/plugin_api_tests/test_db_driver/main.go

@@ -32,13 +32,10 @@ func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model
 	settings := p.API.GetUnsanitizedConfig().SqlSettings
 	settings.Trace = model.NewBool(false)
 	store := sqlstore.New(settings, nil)
-	store.GetMaster().Db.Close()
+	store.GetMasterX().Close()
 
 	for _, isMaster := range []bool{true, false} {
-		// We replace the master DB with master and replica both just to make
-		// gorp APIs work.
 		handle := sql.OpenDB(driver.NewConnector(p.Driver, isMaster))
-		store.GetMaster().Db = handle
 		store.SetMasterX(handle)
 
 		wrapper := sqlstore.NewStoreTestWrapper(store)
@@ -49,7 +46,7 @@ func (p *MyPlugin) MessageWillBePosted(_ *plugin.Context, _ *model.Post) (*model
 		storetest.TestChannelStore(p.t, store, wrapper)
 		storetest.TestBotStore(p.t, store, wrapper)
 
-		store.GetMaster().Db.Close()
+		store.GetMasterX().Close()
 	}
 
 	// Use the API to instantiate the driver

app/plugin_db_driver.go

@@ -40,11 +40,11 @@ func NewDriverImpl(s *Server) *DriverImpl {
 }
 
 func (d *DriverImpl) Conn(isMaster bool) (string, error) {
-	dbFunc := d.s.sqlStore.GetMaster
+	dbFunc := d.s.sqlStore.GetMasterX
 	if !isMaster {
-		dbFunc = d.s.sqlStore.GetReplica
+		dbFunc = d.s.sqlStore.GetReplicaX
 	}
-	conn, err := dbFunc().Db.Conn(context.Background())
+	conn, err := dbFunc().Conn(context.Background())
 	if err != nil {
 		return "", err
 	}

app/server_test.go

@@ -90,7 +90,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
 		})
 		require.NoError(t, err)
 		defer s.Shutdown()
-		require.Same(t, s.sqlStore.GetMaster(), s.sqlStore.GetReplica())
+		require.Same(t, s.sqlStore.GetMasterX(), s.sqlStore.GetReplicaX())
 		require.Len(t, s.Config().SqlSettings.DataSourceReplicas, 1)
 	})
 
@@ -103,7 +103,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
 		})
 		require.NoError(t, err)
 		defer s.Shutdown()
-		require.NotSame(t, s.sqlStore.GetMaster(), s.sqlStore.GetReplica())
+		require.NotSame(t, s.sqlStore.GetMasterX(), s.sqlStore.GetReplicaX())
 		require.Len(t, s.Config().SqlSettings.DataSourceReplicas, 1)
 	})
 
@@ -116,7 +116,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
 		})
 		require.NoError(t, err)
 		defer s.Shutdown()
-		require.Same(t, s.sqlStore.GetMaster(), s.sqlStore.GetSearchReplica())
+		require.Same(t, s.sqlStore.GetMasterX(), s.sqlStore.GetSearchReplicaX())
 		require.Len(t, s.Config().SqlSettings.DataSourceSearchReplicas, 1)
 	})
 
@@ -130,7 +130,7 @@ func TestReadReplicaDisabledBasedOnLicense(t *testing.T) {
 		})
 		require.NoError(t, err)
 		defer s.Shutdown()
-		require.NotSame(t, s.sqlStore.GetMaster(), s.sqlStore.GetSearchReplica())
+		require.NotSame(t, s.sqlStore.GetMasterX(), s.sqlStore.GetSearchReplicaX())
 		require.Len(t, s.Config().SqlSettings.DataSourceSearchReplicas, 1)
 	})
 }