From 08e4392278a4bf40e1a231189b262e2fc2a3d4f9 Mon Sep 17 00:00:00 2001 From: zer0sub Date: Sun, 5 May 2019 14:05:43 +0200 Subject: [PATCH] Cleanup leftover. --- sqlbuilder/table.go | 9 --------- sqlbuilder/table_test.go | 23 ----------------------- 2 files changed, 32 deletions(-) diff --git a/sqlbuilder/table.go b/sqlbuilder/table.go index 7870f08..f6eefea 100644 --- a/sqlbuilder/table.go +++ b/sqlbuilder/table.go @@ -67,8 +67,6 @@ type Table struct { name string alias string columns []Column - // If not empty, the name of the index to force - forcedIndex string } func (t *Table) Column(name string) Column { @@ -106,13 +104,6 @@ func (t *Table) Columns() []Column { return t.columns } -// Returns a copy of this tableName, but with the specified index forced. -func (t *Table) ForceIndex(index string) *Table { - newTable := *t - newTable.forcedIndex = index - return &newTable -} - // Generates the sql string for the current tableName expression. Note: the // generated string may not be a valid/executable sql statement. func (t *Table) SerializeSql(out *queryData) error { diff --git a/sqlbuilder/table_test.go b/sqlbuilder/table_test.go index 59209bb..6537c94 100644 --- a/sqlbuilder/table_test.go +++ b/sqlbuilder/table_test.go @@ -46,29 +46,6 @@ func (s *TableSuite) TestCInvalidLookup(c *gc.C) { c.Assert(err, gc.NotNil) } -func (s *TableSuite) TestValidForcedIndex(c *gc.C) { - t := table1.ForceIndex("foo") - buf := &bytes.Buffer{} - err := t.SerializeSql(buf) - c.Assert(err, gc.IsNil) - sql := buf.String() - c.Assert(sql, gc.Equals, "db.table1 FORCE INDEX (foo)") - - // Ensure the original tableName is unchanged - buf = &bytes.Buffer{} - err = table1.SerializeSql(buf) - c.Assert(err, gc.IsNil) - sql = buf.String() - c.Assert(sql, gc.Equals, "db.table1") -} - -func (s *TableSuite) TestInvalidForcedIndex(c *gc.C) { - t := table1.ForceIndex("foo\x00") - buf := &bytes.Buffer{} - err := t.SerializeSql(buf) - c.Assert(err, gc.NotNil) -} - func (s *TableSuite) TestJoinNilLeftTable(c *gc.C) { join := InnerJoinOn(nil, table2, EqL(table2Col3, 123))