Merge pull request #47 from joonash/schema-rename-support

Schema rename support

generator/internal/template/templates.go

@@ -41,6 +41,15 @@ type {{.GoStructName}} struct {
 func (a *{{.GoStructName}}) AS(alias string) {{.GoStructName}} {
 	aliasTable := new{{.GoStructName}}()
 	aliasTable.Table.AS(alias)
+	aliasTable.Table.Schema(a.Table.SchemaName())
+	return aliasTable
+}
+
+// Schema creates new {{.GoStructName}} with assigned schema name
+func (a *{{.GoStructName}}) Schema(schemaName string) {{.GoStructName}} {
+	aliasTable := new{{.GoStructName}}()
+	aliasTable.Table.AS(a.Table.Alias())
+	aliasTable.Table.Schema(schemaName)
 	return aliasTable
 }
 
@@ -104,6 +113,15 @@ type {{.GoStructName}} struct {
 func (a *{{.GoStructName}}) AS(alias string) *{{.GoStructName}} {
 	aliasTable := new{{.GoStructName}}()
 	aliasTable.Table.AS(alias)
+	aliasTable.Table.Schema(a.Table.SchemaName())
+	return aliasTable
+}
+
+// Schema creates new {{.GoStructName}} with assigned schema name
+func (a *{{.GoStructName}}) Schema(schemaName string) *{{.GoStructName}} {
+	aliasTable := new{{.GoStructName}}()
+	aliasTable.Table.AS(a.Table.Alias())
+	aliasTable.Table.Schema(schemaName)
 	return aliasTable
 }
 

internal/jet/table.go

@@ -16,6 +16,8 @@ type Table interface {
 	SchemaName() string
 	TableName() string
 	AS(alias string)
+	Alias() string
+	Schema(schemaName string)
 }
 
 // NewTable creates new table with schema Name, table Name and list of columns
@@ -67,13 +69,25 @@ func (t *tableImpl) columns() []Column {
 	return ret
 }
 
+func (t *tableImpl) Alias() string {
+	return t.alias
+}
+
+func (t *tableImpl) Schema(schemaName string) {
+	t.schemaName = schemaName
+}
+
 func (t *tableImpl) serialize(statement StatementType, out *SQLBuilder, options ...SerializeOption) {
 	if t == nil {
 		panic("jet: tableImpl is nil")
 	}
 
-	out.WriteIdentifier(t.schemaName)
-	out.WriteString(".")
+	// Use default schema if the schema name is not set
+	if len(t.schemaName) > 0 {
+		out.WriteIdentifier(t.schemaName)
+		out.WriteString(".")
+	}
+
 	out.WriteIdentifier(t.name)
 
 	if len(t.alias) > 0 {
@@ -145,6 +159,13 @@ func (t *joinTableImpl) columns() []Column {
 	return ret
 }
 
+func (t *joinTableImpl) Alias() string {
+	return ""
+}
+
+func (t *joinTableImpl) Schema(schemaName string) {
+}
+
 func (t *joinTableImpl) serialize(statement StatementType, out *SQLBuilder, options ...SerializeOption) {
 	if t == nil {
 		panic("jet: Join table is nil. ")

internal/jet/table_test.go

@@ -31,3 +31,38 @@ INNER JOIN schema.table2 ON ("intCol1" = "intCol2")`)
 	require.Equal(t, joinTable.columns()[0].Name(), "intCol1")
 	require.Equal(t, joinTable.columns()[1].Name(), "intCol2")
 }
+
+func TestSchemaNameSet(t *testing.T) {
+	newTable := NewTable("schema", "table")
+	newTable.Schema("foo")
+	newTable.AS("bar")
+	assertClauseSerialize(t, newTable, `foo.table AS bar`)
+}
+
+func TestSchemaNameClear(t *testing.T) {
+	newTable := NewTable("schema", "table")
+	newTable.Schema("")
+	newTable.AS("bar")
+	assertClauseSerialize(t, newTable, `table AS bar`)
+}
+
+func TestNewJoinTableSchemaNameSet(t *testing.T) {
+	newTable1 := NewTable("schema", "table", IntegerColumn("intCol1"))
+	newTable2 := NewTable("schema", "table2", IntegerColumn("intCol2"))
+
+	newTable1.Schema("foo")
+	newTable2.Schema("foo")
+
+	joinTable := NewJoinTable(newTable1, newTable2, InnerJoin, IntegerColumn("intCol1").EQ(IntegerColumn("intCol2")))
+	joinTable.Schema("xxx")
+
+	assertClauseSerialize(t, joinTable, `foo.table
+INNER JOIN foo.table2 ON ("intCol1" = "intCol2")`)
+
+	require.Equal(t, joinTable.SchemaName(), "foo")
+	require.Equal(t, joinTable.TableName(), "")
+
+	require.Equal(t, len(joinTable.columns()), 2)
+	require.Equal(t, joinTable.columns()[0].Name(), "intCol1")
+	require.Equal(t, joinTable.columns()[1].Name(), "intCol2")
+}