Change SqlTable name attribute to better match the documentation

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/SqlTable.java

@@ -24,17 +24,14 @@ public class SqlTable {
 
     private Supplier<String> nameSupplier;
 
-    protected SqlTable(String name) {
-        Objects.requireNonNull(name);
+    protected SqlTable(String fullyQualifiedTableName) {
+        Objects.requireNonNull(fullyQualifiedTableName);
 
-        this.nameSupplier = () -> name;
+        this.nameSupplier = () -> fullyQualifiedTableName;
     }
 
     protected SqlTable(Supplier<Optional<String>> schemaSupplier, String tableName) {
-        Objects.requireNonNull(schemaSupplier);
-        Objects.requireNonNull(tableName);
-        
-        this.nameSupplier = () -> compose(schemaSupplier, tableName);
+        this(Optional::empty, schemaSupplier, tableName);
     }
 
     protected SqlTable(Supplier<Optional<String>> catalogSupplier, Supplier<Optional<String>> schemaSupplier, String tableName) {
@@ -72,7 +69,7 @@ private String composeCatalogSchemaAndAndTable(String catalog, String schema, St
         return catalog + "." + schema + "." + tableName; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
-    public String name() {
+    public String fullyQualifiedTableName() {
         return nameSupplier.get();
     }
 

src/main/java/org/mybatis/dynamic/sql/delete/render/DeleteRenderer.java

@@ -58,7 +58,7 @@ private Optional<WhereClauseProvider> renderWhereClause(WhereModel whereModel) {
 
     private String calculateDeleteStatement(Optional<WhereClauseProvider> whereClause) {
         return "delete from" //$NON-NLS-1$
-                + spaceBefore(deleteModel.table().name())
+                + spaceBefore(deleteModel.table().fullyQualifiedTableName())
                 + spaceBefore(whereClause.map(WhereClauseProvider::getWhereClause));
     }
 

src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsertRenderer.java

@@ -54,7 +54,7 @@ private FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, InsertMapping
 
     private String calculateInsertStatement(FieldAndValueCollector<T> collector) {
         return "insert into" //$NON-NLS-1$
-                + spaceBefore(model.table().name())
+                + spaceBefore(model.table().fullyQualifiedTableName())
                 + spaceBefore(collector.columnsPhrase())
                 + spaceBefore(collector.valuesPhrase());
     }

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertRenderer.java

@@ -46,7 +46,7 @@ public InsertStatementProvider<T> render() {
 
     private String calculateInsertStatement(FieldAndValueCollector<T> collector) {
         return "insert into" //$NON-NLS-1$
-                + spaceBefore(model.table().name())
+                + spaceBefore(model.table().fullyQualifiedTableName())
                 + spaceBefore(collector.columnsPhrase())
                 + spaceBefore(collector.valuesPhrase());
     }

src/main/java/org/mybatis/dynamic/sql/insert/render/InsertSelectRenderer.java

@@ -47,7 +47,7 @@ public InsertSelectStatementProvider render() {
 
     private String calculateInsertStatement(SelectStatementProvider selectStatement) {
         return "insert into" //$NON-NLS-1$
-                + spaceBefore(model.table().name())
+                + spaceBefore(model.table().fullyQualifiedTableName())
                 + spaceBefore(calculateColumnsPhrase())
                 + spaceBefore(selectStatement.getSelectStatement());
     }

src/main/java/org/mybatis/dynamic/sql/render/GuaranteedTableAliasCalculator.java

@@ -37,7 +37,7 @@ private GuaranteedTableAliasCalculator(Map<SqlTable, String> aliases) {
     public Optional<String> aliasForColumn(SqlTable table) {
         return super.aliasForColumn(table)
                 .map(Optional::of)
-                .orElse(Optional.of(table.name()));
+                .orElse(Optional.of(table.fullyQualifiedTableName()));
     }
 
     public static TableAliasCalculator of(Map<SqlTable, String> aliases) {

src/main/java/org/mybatis/dynamic/sql/select/QueryExpressionModel.java

@@ -88,7 +88,7 @@ public Optional<GroupByModel> groupByModel() {
     }
 
     public String calculateTableNameIncludingAlias(SqlTable table) {
-        return table.name()
+        return table.fullyQualifiedTableName()
                 + spaceBefore(tableAliasCalculator.aliasForTable(table));
     }
 

src/main/java/org/mybatis/dynamic/sql/update/render/UpdateRenderer.java

@@ -65,7 +65,7 @@ private FragmentCollector calculateColumnMappings() {
 
     private String calculateUpdateStatement(FragmentCollector fc, Optional<WhereClauseProvider> whereClause) {
         return "update" //$NON-NLS-1$
-                + spaceBefore(updateModel.table().name())
+                + spaceBefore(updateModel.table().fullyQualifiedTableName())
                 + spaceBefore(calculateSetPhrase(fc))
                 + spaceBefore(whereClause.map(WhereClauseProvider::getWhereClause));
     }

src/test/java/org/mybatis/dynamic/sql/SqlTableTest.java

@@ -27,78 +27,78 @@ public class SqlTableTest {
     @Test
     public void testSchemaSupplierEmpty() {
         SqlTable table = new SqlTable(Optional::empty, "my_table");
-        assertThat(table.name()).isEqualTo("my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("my_table");
     }
 
     @Test
     public void testSchemaSupplierWithValue() {
         SqlTable table = new SqlTable(() -> Optional.of("my_schema"), "my_table");
-        assertThat(table.name()).isEqualTo("my_schema.my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("my_schema.my_table");
     }
 
     @Test
     public void testSingletonSchemaSupplier() {
         SqlTable table = new SqlTable(MySchemaSupplier.instance(), "my_table");
-        assertThat(table.name()).isEqualTo("first_schema.my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("first_schema.my_table");
     }
 
     @Test
     public void testThatSchemaSupplierDoesDelay() {
         MySchemaSupplier schemaSupplier = new MySchemaSupplier();
         SqlTable table = new SqlTable(schemaSupplier, "my_table");
-        assertThat(table.name()).isEqualTo("first_schema.my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("first_schema.my_table");
 
         schemaSupplier.setFirst(false);
-        assertThat(table.name()).isEqualTo("second_schema.my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("second_schema.my_table");
     }
 
     @Test
     public void testCatalogAndSchemaSupplierEmpty() {
         SqlTable table = new SqlTable(Optional::empty, Optional::empty, "my_table");
-        assertThat(table.name()).isEqualTo("my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("my_table");
     }
 
     @Test
     public void testCatalogSupplierWithValue() {
         SqlTable table = new SqlTable(() -> Optional.of("my_catalog"), Optional::empty, "my_table");
-        assertThat(table.name()).isEqualTo("my_catalog..my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("my_catalog..my_table");
     }
 
     @Test
     public void testThatCatalogSupplierDoesDelay() {
         MyCatalogSupplier catalogSupplier = new MyCatalogSupplier();
         SqlTable table = new SqlTable(catalogSupplier, Optional::empty, "my_table");
-        assertThat(table.name()).isEqualTo("first_catalog..my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("first_catalog..my_table");
 
         catalogSupplier.setFirst(false);
-        assertThat(table.name()).isEqualTo("second_catalog..my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("second_catalog..my_table");
     }
 
     @Test
     public void testThatCatalogSupplierAndSchemaSupplierBothDelay() {
         MyCatalogSupplier catalogSupplier = new MyCatalogSupplier();
         MySchemaSupplier schemaSupplier = new MySchemaSupplier();
         SqlTable table = new SqlTable(catalogSupplier, schemaSupplier, "my_table");
-        assertThat(table.name()).isEqualTo("first_catalog.first_schema.my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("first_catalog.first_schema.my_table");
 
         catalogSupplier.setFirst(false);
-        assertThat(table.name()).isEqualTo("second_catalog.first_schema.my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("second_catalog.first_schema.my_table");
 
         catalogSupplier.setFirst(true);
         schemaSupplier.setFirst(false);
-        assertThat(table.name()).isEqualTo("first_catalog.second_schema.my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("first_catalog.second_schema.my_table");
 
         catalogSupplier.setFirst(false);
-        assertThat(table.name()).isEqualTo("second_catalog.second_schema.my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("second_catalog.second_schema.my_table");
 
         catalogSupplier.setEmpty(true);
-        assertThat(table.name()).isEqualTo("second_schema.my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("second_schema.my_table");
 
         schemaSupplier.setEmpty(true);
-        assertThat(table.name()).isEqualTo("my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("my_table");
 
         catalogSupplier.setEmpty(false);
-        assertThat(table.name()).isEqualTo("second_catalog..my_table");
+        assertThat(table.fullyQualifiedTableName()).isEqualTo("second_catalog..my_table");
     }
 
     public static class MySchemaSupplier implements Supplier<Optional<String>> {