From 860e5d483cd952ec833c40312a2141bb3e4ef579 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 29 May 2017 15:46:35 -0400
Subject: PLT-6341/PLT-6342 Update gorp to mattermost fork and add connection
 timeout setting (#6410)

* Update gorp to mattermost fork and add connection timeout setting

* Add go dependency

* Rename from connection timeout to query timeout

* Properly add gorp dependency
---
 vendor/github.com/go-gorp/gorp/dialect_sqlite.go | 119 -----------------------
 1 file changed, 119 deletions(-)
 delete mode 100644 vendor/github.com/go-gorp/gorp/dialect_sqlite.go

(limited to 'vendor/github.com/go-gorp/gorp/dialect_sqlite.go')

diff --git a/vendor/github.com/go-gorp/gorp/dialect_sqlite.go b/vendor/github.com/go-gorp/gorp/dialect_sqlite.go
deleted file mode 100644
index 7d9b29757..000000000
--- a/vendor/github.com/go-gorp/gorp/dialect_sqlite.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2012 James Cooper. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-// Package gorp provides a simple way to marshal Go structs to and from
-// SQL databases.  It uses the database/sql package, and should work with any
-// compliant database/sql driver.
-//
-// Source code and project home:
-// https://github.com/go-gorp/gorp
-
-package gorp
-
-import (
-	"fmt"
-	"reflect"
-)
-
-type SqliteDialect struct {
-	suffix string
-}
-
-func (d SqliteDialect) QuerySuffix() string { return ";" }
-
-func (d SqliteDialect) ToSqlType(val reflect.Type, maxsize int, isAutoIncr bool) string {
-	switch val.Kind() {
-	case reflect.Ptr:
-		return d.ToSqlType(val.Elem(), maxsize, isAutoIncr)
-	case reflect.Bool:
-		return "integer"
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return "integer"
-	case reflect.Float64, reflect.Float32:
-		return "real"
-	case reflect.Slice:
-		if val.Elem().Kind() == reflect.Uint8 {
-			return "blob"
-		}
-	}
-
-	switch val.Name() {
-	case "NullInt64":
-		return "integer"
-	case "NullFloat64":
-		return "real"
-	case "NullBool":
-		return "integer"
-	case "Time":
-		return "datetime"
-	}
-
-	if maxsize < 1 {
-		maxsize = 255
-	}
-	return fmt.Sprintf("varchar(%d)", maxsize)
-}
-
-// Returns autoincrement
-func (d SqliteDialect) AutoIncrStr() string {
-	return "autoincrement"
-}
-
-func (d SqliteDialect) AutoIncrBindValue() string {
-	return "null"
-}
-
-func (d SqliteDialect) AutoIncrInsertSuffix(col *ColumnMap) string {
-	return ""
-}
-
-// Returns suffix
-func (d SqliteDialect) CreateTableSuffix() string {
-	return d.suffix
-}
-
-func (d SqliteDialect) CreateIndexSuffix() string {
-	return ""
-}
-
-func (d SqliteDialect) DropIndexSuffix() string {
-	return ""
-}
-
-// With sqlite, there technically isn't a TRUNCATE statement,
-// but a DELETE FROM uses a truncate optimization:
-// http://www.sqlite.org/lang_delete.html
-func (d SqliteDialect) TruncateClause() string {
-	return "delete from"
-}
-
-// Returns "?"
-func (d SqliteDialect) BindVar(i int) string {
-	return "?"
-}
-
-func (d SqliteDialect) InsertAutoIncr(exec SqlExecutor, insertSql string, params ...interface{}) (int64, error) {
-	return standardInsertAutoIncr(exec, insertSql, params...)
-}
-
-func (d SqliteDialect) QuoteField(f string) string {
-	return `"` + f + `"`
-}
-
-// sqlite does not have schemas like PostgreSQL does, so just escape it like normal
-func (d SqliteDialect) QuotedTableForQuery(schema string, table string) string {
-	return d.QuoteField(table)
-}
-
-func (d SqliteDialect) IfSchemaNotExists(command, schema string) string {
-	return fmt.Sprintf("%s if not exists", command)
-}
-
-func (d SqliteDialect) IfTableExists(command, schema, table string) string {
-	return fmt.Sprintf("%s if exists", command)
-}
-
-func (d SqliteDialect) IfTableNotExists(command, schema, table string) string {
-	return fmt.Sprintf("%s if not exists", command)
-}
-- 
cgit v1.2.3-1-g7c22