Inlcude schema dump in database dump.

Author: smarnach

src/tasks/dump_db.rs

@@ -16,7 +16,7 @@ pub fn dump_db(
     target_name: String,
 ) -> Result<(), PerformError> {
     let directory = DumpDirectory::create()?;
-    directory.dump_db(&database_url)?;
+    directory.populate(&database_url)?;
     let tarball = DumpTarball::create(&directory.export_dir)?;
     tarball.upload(&target_name, &env.uploader)?;
     println!("Database dump uploaded to {}.", &target_name);
@@ -45,14 +45,11 @@ impl DumpDirectory {
         })
     }
 
-    pub fn dump_db(&self, database_url: &str) -> Result<(), PerformError> {
+    pub fn populate(&self, database_url: &str) -> Result<(), PerformError> {
         self.add_readme()?;
         self.add_metadata()?;
-        let export_script = self.export_dir.join("export.sql");
-        let import_script = self.export_dir.join("import.sql");
-        gen_scripts::gen_scripts(&export_script, &import_script)?;
-        std::fs::create_dir(self.export_dir.join("data"))?;
-        run_psql(&export_script, database_url)
+        self.dump_schema(database_url)?;
+        self.dump_db(database_url)
     }
 
     fn add_readme(&self) -> Result<(), PerformError> {
@@ -80,6 +77,30 @@ impl DumpDirectory {
         serde_json::to_writer_pretty(file, &metadata)?;
         Ok(())
     }
+
+    pub fn dump_schema(&self, database_url: &str) -> Result<(), PerformError> {
+        let schema_sql = File::create(self.export_dir.join("schema.sql"))?;
+        let status = std::process::Command::new("pg_dump")
+            .arg("--schema-only")
+            .arg("--no-owner")
+            .arg("--no-acl")
+            .arg(database_url)
+            .stdout(schema_sql)
+            .spawn()?
+            .wait()?;
+        if !status.success() {
+            Err("pg_dump did not finish successfully.")?;
+        }
+        Ok(())
+    }
+
+    pub fn dump_db(&self, database_url: &str) -> Result<(), PerformError> {
+        let export_script = self.export_dir.join("export.sql");
+        let import_script = self.export_dir.join("import.sql");
+        gen_scripts::gen_scripts(&export_script, &import_script)?;
+        std::fs::create_dir(self.export_dir.join("data"))?;
+        run_psql(&export_script, database_url)
+    }
 }
 
 impl Drop for DumpDirectory {

src/tasks/dump_db/readme_for_tarball.md

@@ -17,14 +17,14 @@ This is a dump of the public information in the crates.io database.
 
 ## Restoring to a Local crates.io Database
 
-WARNING: This will destroy the current database contents.
-
-1. Create a new database and run the Diesel migrations.
+1. Create a new database.
 
         createdb DATABASE_NAME
-        diesel migration run --database-url DATABASE_URL
 
-2. Run this script.
+2. Restore the database schema.
+
+        psql DATABASE_NAME < schema.sql
+
+3. Run the import script.
 
-        cd DUMP_DIRECTORY
         psql DATABASE_URL < import.sql

src/tests/dump_db.rs

@@ -11,7 +11,7 @@ fn dump_db_and_reimport_dump() {
     // TODO prefill database with some data
 
     let directory = dump_db::DumpDirectory::create().unwrap();
-    directory.dump_db(&database_url).unwrap();
+    directory.populate(&database_url).unwrap();
 
     let schema = TemporarySchema::create(database_url, "test_db_dump");
     schema.run_migrations();