More renaming

drivers/postgres/postgres.go

@@ -169,10 +169,10 @@ func (d *driveri) doOpen(ctx context.Context, src *source.Source) (*sql.DB, erro
 	}
 
 	if src.Catalog != "" && src.Catalog != dbCfg.ConnConfig.Database {
-		// The catalog differs from the pool in the connection string.
-		// OOTB, Postgres doesn't support cross-pool references. So,
+		// The catalog differs from the database in the connection string.
+		// OOTB, Postgres doesn't support cross-database references. So,
 		// we'll need to change the connection string to use the catalog
-		// as the pool. Note that we don't modify src.Location, but it's
+		// as the database. Note that we don't modify src.Location, but it's
 		// not entirely clear if that's the correct approach. Are there any
 		// downsides to modifying it (as long as the modified Location is not
 		// persisted back to config)?
@@ -187,7 +187,7 @@ func (d *driveri) doOpen(ctx context.Context, src *source.Source) (*sql.DB, erro
 		if err != nil {
 			return nil, errw(err)
 		}
-		log.Debug("Using catalog as pool in connection string",
+		log.Debug("Using catalog as database in connection string",
 			lga.Src, src,
 			lga.Catalog, src.Catalog,
 			lga.Conn, source.RedactLocation(connStr),

drivers/xlsx/database.go

@@ -146,7 +146,7 @@ func (p *pool) TableMetadata(ctx context.Context, tblName string) (*source.Table
 func (p *pool) Close() error {
 	p.log.Debug(lgm.CloseDB, lga.Handle, p.src.Handle)
 
-	// No need to explicitly invoke c.scratchDB.Close because
+	// No need to explicitly invoke c.scratchPool.Close because
 	// that's already added to c.clnup
 	return p.clnup.Run()
 }

drivers/xlsx/ingest.go

@@ -92,16 +92,16 @@ func (xs *xSheet) loadSampleRows(ctx context.Context, sampleSize int) error {
 	return nil
 }
 
-// ingestXLSX loads the data in xfile into scratchDB.
+// ingestXLSX loads the data in xfile into scratchPool.
 // If includeSheetNames is non-empty, only the named sheets are ingested.
-func ingestXLSX(ctx context.Context, src *source.Source, scratchDB driver.Pool,
+func ingestXLSX(ctx context.Context, src *source.Source, scratchPool driver.Pool,
 	xfile *excelize.File, includeSheetNames []string,
 ) error {
 	log := lg.FromContext(ctx)
 	start := time.Now()
 	log.Debug("Beginning import from XLSX",
 		lga.Src, src,
-		lga.Target, scratchDB.Source())
+		lga.Target, scratchPool.Source())
 
 	var sheets []*xSheet
 	if len(includeSheetNames) > 0 {
@@ -132,18 +132,18 @@ func ingestXLSX(ctx context.Context, src *source.Source, scratchDB driver.Pool,
 		}
 
 		var db *sql.DB
-		if db, err = scratchDB.DB(ctx); err != nil {
+		if db, err = scratchPool.DB(ctx); err != nil {
 			return err
 		}
 
-		if err = scratchDB.SQLDriver().CreateTable(ctx, db, sheetTbl.def); err != nil {
+		if err = scratchPool.SQLDriver().CreateTable(ctx, db, sheetTbl.def); err != nil {
 			return err
 		}
 	}
 
 	log.Debug("Tables created (but not yet populated)",
 		lga.Count, len(sheetTbls),
-		lga.Target, scratchDB.Source(),
+		lga.Target, scratchPool.Source(),
 		lga.Elapsed, time.Since(start))
 
 	var imported, skipped int
@@ -154,7 +154,7 @@ func ingestXLSX(ctx context.Context, src *source.Source, scratchDB driver.Pool,
 			continue
 		}
 
-		if err = ingestSheetToTable(ctx, scratchDB, sheetTbls[i]); err != nil {
+		if err = ingestSheetToTable(ctx, scratchPool, sheetTbls[i]); err != nil {
 			return err
 		}
 		imported++
@@ -164,16 +164,16 @@ func ingestXLSX(ctx context.Context, src *source.Source, scratchDB driver.Pool,
 		lga.Count, imported,
 		"skipped", skipped,
 		lga.From, src,
-		lga.To, scratchDB.Source(),
+		lga.To, scratchPool.Source(),
 		lga.Elapsed, time.Since(start),
 	)
 
 	return nil
 }
 
 // ingestSheetToTable imports the sheet data into the appropriate table
-// in scratchDB. The scratch table must already exist.
-func ingestSheetToTable(ctx context.Context, scratchDB driver.Pool, sheetTbl *sheetTable) error {
+// in scratchPool. The scratch table must already exist.
+func ingestSheetToTable(ctx context.Context, scratchPool driver.Pool, sheetTbl *sheetTable) error {
 	var (
 		log          = lg.FromContext(ctx)
 		startTime    = time.Now()
@@ -183,7 +183,7 @@ func ingestSheetToTable(ctx context.Context, scratchDB driver.Pool, sheetTbl *sh
 		destColKinds = tblDef.ColKinds()
 	)
 
-	db, err := scratchDB.DB(ctx)
+	db, err := scratchPool.DB(ctx)
 	if err != nil {
 		return err
 	}
@@ -194,7 +194,7 @@ func ingestSheetToTable(ctx context.Context, scratchDB driver.Pool, sheetTbl *sh
 	}
 	defer lg.WarnIfCloseError(log, lgm.CloseDB, conn)
 
-	drvr := scratchDB.SQLDriver()
+	drvr := scratchPool.SQLDriver()
 
 	batchSize := driver.MaxBatchRows(drvr, len(destColKinds))
 	bi, err := driver.NewBatchInsert(ctx, drvr, conn, tblDef.Name, tblDef.ColNames(), batchSize)
@@ -264,7 +264,7 @@ func ingestSheetToTable(ctx context.Context, scratchDB driver.Pool, sheetTbl *sh
 	log.Debug("Inserted rows from sheet into table",
 		lga.Count, bi.Written(),
 		laSheet, sheet.name,
-		lga.Target, source.Target(scratchDB.Source(), tblDef.Name),
+		lga.Target, source.Target(scratchPool.Source(), tblDef.Name),
 		lga.Elapsed, time.Since(startTime))
 
 	return nil

drivers/xlsx/xlsx.go

@@ -63,18 +63,18 @@ func (d *Driver) DriverMetadata() driver.Metadata {
 func (d *Driver) Open(ctx context.Context, src *source.Source) (driver.Pool, error) {
 	lg.FromContext(ctx).Debug(lgm.OpenSrc, lga.Src, src)
 
-	scratchDB, err := d.scratcher.OpenScratch(ctx, src.Handle)
+	scratchPool, err := d.scratcher.OpenScratch(ctx, src.Handle)
 	if err != nil {
 		return nil, err
 	}
 
 	clnup := cleanup.New()
-	clnup.AddE(scratchDB.Close)
+	clnup.AddE(scratchPool.Close)
 
 	p := &pool{
 		log:         d.log,
 		src:         src,
-		scratchPool: scratchDB,
+		scratchPool: scratchPool,
 		files:       d.files,
 		clnup:       clnup,
 	}