From 35e7d70075525f25cce50a32d0dcdeb5ec904006 Mon Sep 17 00:00:00 2001 From: Suhail Patel Date: Sun, 15 Nov 2020 18:17:43 +0000 Subject: [PATCH] Remove unused functions --- relation.go | 21 --------------------- table.go | 45 --------------------------------------------- 2 files changed, 66 deletions(-) diff --git a/relation.go b/relation.go index 7d67791..c960b46 100644 --- a/relation.go +++ b/relation.go @@ -3,7 +3,6 @@ package gocassa import ( "fmt" "reflect" - "strings" "time" ) @@ -48,26 +47,6 @@ func (r Relation) Terms() []interface{} { return r.terms } -func (r Relation) cql() (string, []interface{}) { - ret := "" - field := strings.ToLower(r.Field()) - switch r.Comparator() { - case CmpEquality: - ret = field + " = ?" - case CmpIn: - return field + " IN ?", r.Terms() - case CmpGreaterThan: - ret = field + " > ?" - case CmpGreaterThanOrEquals: - ret = field + " >= ?" - case CmpLesserThan: - ret = field + " < ?" - case CmpLesserThanOrEquals: - ret = field + " <= ?" - } - return ret, r.Terms() -} - func anyEquals(value interface{}, terms []interface{}) bool { primVal := convertToPrimitive(value) for _, term := range terms { diff --git a/table.go b/table.go index aa28dbd..37c0fa4 100644 --- a/table.go +++ b/table.go @@ -1,10 +1,7 @@ package gocassa import ( - "bytes" - "fmt" "reflect" - "strconv" "strings" r "github.com/monzo/gocassa/reflect" @@ -50,18 +47,6 @@ func newTableInfo(keyspace, name string, keys Keys, entity interface{}, fieldSou return cinf } -// Since we cant have Map -> [(k, v)] we settle for Map -> ([k], [v]) -// #tuplelessLifeSucks -func keyValues(m map[string]interface{}) ([]string, []interface{}) { - keys := []string{} - values := []interface{}{} - for _, k := range sortedKeys(m) { - keys = append(keys, k) - values = append(values, m[k]) - } - return keys, values -} - func toMap(i interface{}) (m map[string]interface{}, ok bool) { switch v := i.(type) { case map[string]interface{}: @@ -144,36 +129,6 @@ func allFieldValuesAreNullable(fields map[string]interface{}) bool { return true } -// INSERT INTO Hollywood.NerdMovies (user_uuid, fan) -// VALUES ('cfd66ccc-d857-4e90-b1e5-df98a3d40cd6', 'johndoe') -// -// Gotcha: primkey must be first -func insertStatement(keySpaceName, cfName string, fields map[string]interface{}, opts Options) (string, []interface{}) { - fieldNames, vals := keyValues(fields) - - placeHolders := make([]string, len(fieldNames)) - lowerFieldNames := make([]string, len(fieldNames)) - for i, v := range fieldNames { - placeHolders[i] = "?" - lowerFieldNames[i] = strings.ToLower(v) - } - - buf := new(bytes.Buffer) - buf.WriteString(fmt.Sprintf("INSERT INTO %s.%s (%s) VALUES (%s)", - keySpaceName, - cfName, - strings.Join(lowerFieldNames, ", "), - strings.Join(placeHolders, ", "))) - - // Apply options - if opts.TTL != 0 { - buf.WriteString(" USING TTL ? ") - vals = append(vals, strconv.FormatFloat(opts.TTL.Seconds(), 'f', 0, 64)) - } - - return buf.String(), vals -} - func (t t) Set(i interface{}) Op { m, ok := toMap(i) if !ok {