playground: Replace v.io/x/lib/cmdline with v.io/x/lib/cmdline2
Nobody is using the old cmdline package anymore, so this sequence
of CLs removes the old cmdline and renames cmdline2 to cmdline.
An empty cmdline2/.api file is leftover, necessary for the api
checking tool. That will be removed in a subsequent CL.
MultiPart: 4/4
Change-Id: Ifa79846012936a47ff3ad1d9cc0cc9db83e1a4a7
diff --git a/go/src/v.io/x/playground/pgadmin/main.go b/go/src/v.io/x/playground/pgadmin/main.go
index aa010ea..fc50bf0 100644
--- a/go/src/v.io/x/playground/pgadmin/main.go
+++ b/go/src/v.io/x/playground/pgadmin/main.go
@@ -9,15 +9,15 @@
import (
"flag"
- "v.io/x/lib/cmdline2"
+ "v.io/x/lib/cmdline"
"v.io/x/lib/dbutil"
)
func main() {
- cmdline2.Main(cmdPGAdmin)
+ cmdline.Main(cmdPGAdmin)
}
-var cmdPGAdmin = &cmdline2.Command{
+var cmdPGAdmin = &cmdline.Command{
Name: "pgadmin",
Short: "Playground database management tool",
Long: `
@@ -25,7 +25,7 @@
Supports database schema migration.
TODO(ivanpi): bundle bootstrap
`,
- Children: []*cmdline2.Command{cmdMigrate},
+ Children: []*cmdline.Command{cmdMigrate},
}
var (
diff --git a/go/src/v.io/x/playground/pgadmin/migrate.go b/go/src/v.io/x/playground/pgadmin/migrate.go
index 2897726..2cc0133 100644
--- a/go/src/v.io/x/playground/pgadmin/migrate.go
+++ b/go/src/v.io/x/playground/pgadmin/migrate.go
@@ -19,7 +19,7 @@
"github.com/rubenv/sql-migrate"
- "v.io/x/lib/cmdline2"
+ "v.io/x/lib/cmdline"
"v.io/x/lib/dbutil"
)
@@ -32,16 +32,16 @@
// TODO(ivanpi): Add status command and sanity checks (e.g. "skipped" migrations are incorrectly applied by rubenv/sql-migrate).
// TODO(ivanpi): Guard against version skew corrupting data (e.g. add version check to client).
-var cmdMigrate = &cmdline2.Command{
+var cmdMigrate = &cmdline.Command{
Name: "migrate",
Short: "Database schema migrations",
Long: `
See github.com/rubenv/sql-migrate
` + mysqlWarning,
- Children: []*cmdline2.Command{cmdMigrateUp, cmdMigrateDown},
+ Children: []*cmdline.Command{cmdMigrateUp, cmdMigrateDown},
}
-var cmdMigrateUp = &cmdline2.Command{
+var cmdMigrateUp = &cmdline.Command{
Runner: runWithDBConn(runMigrate(migrate.Up, &flagMigrationsLimitUp)),
Name: "up",
Short: "Apply new database schema migrations",
@@ -50,7 +50,7 @@
` + mysqlWarning,
}
-var cmdMigrateDown = &cmdline2.Command{
+var cmdMigrateDown = &cmdline.Command{
Runner: runWithDBConn(runMigrate(migrate.Down, &flagMigrationsLimitDown)),
Name: "down",
Short: "Roll back database schema migrations",
@@ -79,7 +79,7 @@
// Returns a DBCommand for applying migrations in the provided direction.
func runMigrate(direction migrate.MigrationDirection, limit *int) DBCommand {
- return func(db *sql.DB, env *cmdline2.Env, args []string) error {
+ return func(db *sql.DB, env *cmdline.Env, args []string) error {
migrate.SetTable(migrationsTable)
source := migrate.FileMigrationSource{
@@ -110,12 +110,12 @@
}
// Command to be wrapped with runWithDBConn().
-type DBCommand func(db *sql.DB, env *cmdline2.Env, args []string) error
+type DBCommand func(db *sql.DB, env *cmdline.Env, args []string) error
// runWithDBConn is a wrapper method that handles opening and closing the
// database connection.
-func runWithDBConn(fx DBCommand) cmdline2.RunnerFunc {
- return func(env *cmdline2.Env, args []string) (rerr error) {
+func runWithDBConn(fx DBCommand) cmdline.RunnerFunc {
+ return func(env *cmdline.Env, args []string) (rerr error) {
if *flagSQLConf == "" {
return env.UsageErrorf("SQL configuration file (-sqlconf) must be provided")
}
