rename cvmigrator to vsmigrator

diff --git a/src/main.rs b/src/main.rs
index 24ccbfbd04f0ead2233bab0a5681d435afa162ee..bd841db2a10fe7e20919becab08c3199bde8068d 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,7 +24,7 @@
 //! Options:
 //!       --dbname <DBNAME>          [default: vsearch]
 //!       --dbhost <DBHOST>          [default: localhost]
 //! Options:
 //!       --dbname <DBNAME>          [default: vsearch]
 //!       --dbhost <DBHOST>          [default: localhost]

-//!       --dbuser <DBUSER>          [default: cvmigrator]
+//!       --dbuser <DBUSER>          [default: vsmigrator]

 //!       --dbpassword <DBPASSWORD>  [env: DBPASSWORD=]
 //!   -h, --help                     Print help
 //! ```
 //!       --dbpassword <DBPASSWORD>  [env: DBPASSWORD=]
 //!   -h, --help                     Print help
 //! ```


@@ -32,7 +32,7 @@
 //! For example:
 //! 
 //! ```text
 //! For example:
 //! 
 //! ```text

-//! $ export DBPASSWORD=$(gpg -d pw-cvmigrator.gpg)
+//! $ export DBPASSWORD=$(gpg -d pw-vsmigrator.gpg)

 //! $ vecsearch init-database
 //! maybe creating the database
 //! database vsearch exists already
 //! $ vecsearch init-database
 //! maybe creating the database
 //! database vsearch exists already


@@ -59,7 +59,7 @@
 //! in each invocation.
 //! 
 //! ```text
 //! in each invocation.
 //! 
 //! ```text

-//! $ export DBPASSWORD=$(gpg -d pw-cvmigrator.gpg)
+//! $ export DBPASSWORD=$(gpg -d pw-vsmigrator.gpg)

 //! $ vecsearch index --file testdata/0 --file testdata/1
 //! indexing file(s)
 //! Loaded and encoded 58.565µs
 //! $ vecsearch index --file testdata/0 --file testdata/1
 //! indexing file(s)
 //! Loaded and encoded 58.565µs


@@ -78,7 +78,7 @@
 //! superuser).
 //! 
 //! ```text
 //! superuser).
 //! 
 //! ```text

-//! $ export DBPASSWORD=$(gpg -d pw-cvmigrator.gpg)
+//! $ export DBPASSWORD=$(gpg -d pw-vsmigrator.gpg)

 //! $ vecsearch search --search feline
 //! searching for document matches
 //! Loaded and encoded 49.306µs
 //! $ vecsearch search --search feline
 //! searching for document matches
 //! Loaded and encoded 49.306µs


@@ -90,10 +90,6 @@
 //! The new movie is so great
 //! ```
 //! 
 //! The new movie is so great
 //! ```
 //! 

-//! ## TODO
-//! 
-//! - rename cv-*
-//! 

 use candle_transformers::models::bert::{BertModel, Config, HiddenAct, DTYPE};
 
 use anyhow::{Error as E, Result};
 use candle_transformers::models::bert::{BertModel, Config, HiddenAct, DTYPE};
 
 use anyhow::{Error as E, Result};


@@ -118,7 +114,7 @@ enum Action {
        #[arg(long,env,default_value="localhost")]
        dbhost: String,
 
        #[arg(long,env,default_value="localhost")]
        dbhost: String,
 

-       #[arg(long,env,default_value="cvmigrator")]
+       #[arg(long,env,default_value="vsmigrator")]

        dbuser: String,
 
        #[arg(long,env)]
        dbuser: String,
 
        #[arg(long,env)]


@@ -137,7 +133,7 @@ enum Action {
        #[arg(long,env,default_value="localhost")]
        dbhost: String,
 
        #[arg(long,env,default_value="localhost")]
        dbhost: String,
 

-       #[arg(long,env,default_value="cvmigrator")]
+       #[arg(long,env,default_value="vsmigrator")]

        dbuser: String,
 
        #[arg(long,env)]
        dbuser: String,
 
        #[arg(long,env)]


@@ -157,7 +153,7 @@ enum Action {
        #[arg(long,env,default_value="localhost")]
        dbhost: String,
 
        #[arg(long,env,default_value="localhost")]
        dbhost: String,
 

-       #[arg(long,env,default_value="cvmigrator")]
+       #[arg(long,env,default_value="vsmigrator")]

        dbuser: String,
 
        #[arg(long,env)]
        dbuser: String,
 
        #[arg(long,env)]


@@ -250,11 +246,11 @@ fn init_database(dbname: String, dbhost: String, dbuser: String, dbpassword: Str
        client.query_opt("SELECT 1 FROM pg_database WHERE datname=$1",&[&dbname])?;
 
     match result {
        client.query_opt("SELECT 1 FROM pg_database WHERE datname=$1",&[&dbname])?;
 
     match result {

-       Some(_) => {
+       None => {

            println!("creating database {}", dbname);
            client.execute(&format!("create database {}",dbname),&[])?;
        },
            println!("creating database {}", dbname);
            client.execute(&format!("create database {}",dbname),&[])?;
        },

-       None => println!("database {} exists already", dbname),
+       Some(_) => println!("database {} exists already", dbname),

     }
     client.close()?;
 
     }
     client.close()?;