Merge pull request #281 from uptrace/fix/init-table-once

Fix/init table once
uptrace · Oct 29, 2021 · 074e00b · 074e00b
2 parents 71af086 + 9a1ce1e
commit 074e00b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/schema/table.go b/schema/table.go
@@ -444,7 +444,7 @@ func (t *Table) tryRelation(field *Field) bool {
 
 	if field.Tag.HasOption("join") {
 		internal.Warn.Printf(
-			`%s.%s option "join" requires a relation type`,
+			`%s.%s "join" option must come together with "rel" option`,
 			t.TypeName, field.GoName,
 		)
 	}

diff --git a/schema/tables.go b/schema/tables.go
@@ -101,13 +101,15 @@ func (t *Tables) table(typ reflect.Type, allowInProgress bool) *Table {
 		return table
 	}
 
-	if inProgress.init2() {
-		t.mu.Lock()
-		delete(t.inProgress, typ)
-		t.tables.Store(typ, table)
-		t.mu.Unlock()
+	if !inProgress.init2() {
+		return table
 	}
 
+	t.mu.Lock()
+	delete(t.inProgress, typ)
+	t.tables.Store(typ, table)
+	t.mu.Unlock()
+
 	t.dialect.OnTable(table)
 
 	for _, field := range table.FieldMap {