s/masterminds/mattermost for squirrel (#20162)

Our fork of https://github.com/Masterminds/squirrel at https://github.com/mattermost/squirrel (previously https://github.com/lieut-data/squirrel) isn't compatible with the upstream project, and causes issues for repositories importing mattermost-server and using squirrel.

Sidestep this by adopting the `mattermost/squirrel` fork explicitly.  (Downstream repos can either switch, or keep using the upstream version from `Masterminds`.)
Этот коммит содержится в:
Jesse Hallam
2022-05-10 11:48:59 -03:00
коммит произвёл GitHub
родитель 81700598ec
Коммит a4ad6eda5d
36 изменённых файлов: 37 добавлений и 37 удалений

Просмотреть файл

@@ -4,7 +4,7 @@
package sqlstore
import (
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"database/sql"
"fmt"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -12,7 +12,7 @@ import (
"strings"
"time"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/einterfaces"

Просмотреть файл

@@ -6,7 +6,7 @@ package sqlstore
import (
"fmt"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -4,7 +4,7 @@
package sqlstore
import (
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"database/sql"
"fmt"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -6,7 +6,7 @@ package sqlstore
import (
"database/sql"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"fmt"
"strings"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -10,7 +10,7 @@ import (
"strconv"
"strings"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/einterfaces"

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"fmt"
"strings"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -4,7 +4,7 @@
package sqlstore
import (
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/shared/mlog"

Просмотреть файл

@@ -10,7 +10,7 @@ import (
"strings"
"time"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -4,7 +4,7 @@
package sqlstore
import (
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"database/sql"
"encoding/json"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"database/sql"
"fmt"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -12,7 +12,7 @@ import (
"strings"
"sync"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/einterfaces"

Просмотреть файл

@@ -4,7 +4,7 @@
package sqlstore
import (
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -6,7 +6,7 @@ package sqlstore
import (
"time"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -4,7 +4,7 @@
package sqlstore
import (
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/shared/mlog"

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"fmt"
"strings"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -9,12 +9,12 @@ import (
"strconv"
"strings"
sq "github.com/Masterminds/squirrel"
"github.com/go-sql-driver/mysql"
"github.com/lib/pq"
"github.com/mattermost/mattermost-server/v6/einterfaces"
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/store"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
)

Просмотреть файл

@@ -9,7 +9,7 @@ import (
"fmt"
"strings"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"database/sql"
"fmt"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -9,7 +9,7 @@ import (
"fmt"
"time"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -10,7 +10,7 @@ import (
"github.com/mattermost/mattermost-server/v6/model"
"github.com/mattermost/mattermost-server/v6/store"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
)

Просмотреть файл

@@ -8,7 +8,7 @@ import (
"fmt"
"time"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -16,8 +16,8 @@ import (
"sync/atomic"
"time"
sq "github.com/Masterminds/squirrel"
"github.com/mattermost/morph"
sq "github.com/mattermost/squirrel"
"github.com/mattermost/morph/drivers"
ms "github.com/mattermost/morph/drivers/mysql"

Просмотреть файл

@@ -10,7 +10,7 @@ import (
"strings"
"time"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -9,7 +9,7 @@ import (
"fmt"
"strings"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -10,7 +10,7 @@ import (
"sync"
"time"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -7,7 +7,7 @@ import (
"database/sql"
"fmt"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -6,7 +6,7 @@ package sqlstore
import (
"database/sql"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model"

Просмотреть файл

@@ -11,7 +11,7 @@ import (
"sort"
"strings"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"golang.org/x/sync/errgroup"

Просмотреть файл

@@ -6,7 +6,7 @@ package sqlstore
import (
"database/sql"
sq "github.com/Masterminds/squirrel"
sq "github.com/mattermost/squirrel"
"github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/einterfaces"