remove project version

src/assets/sql/schema.sql

@@ -2,7 +2,6 @@ BEGIN;
 
 CREATE TABLE IF NOT EXISTS projects (
  name TEXT,
- version TEXT,
  created_on DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL,
  origin TEXT
 );

src/db.rs

@@ -107,7 +107,6 @@ pub struct Snapshot {
 pub struct ProjectInfo {
  pub id: i64,
  pub name: String,
- pub version: String,
  pub created_on: DateTime<Utc>,
  pub origin: Option<String>,
 }
@@ -157,15 +156,10 @@ pub fn create_connection(working_dir: &Path) -> Result<Connection> {
  Ok(conn)
 }
 
-pub fn create_project(
- conn: &Connection,
- name: &String,
- version: &String,
- origin: &str,
-) -> Result<i64> {
+pub fn create_project(conn: &Connection, name: &String, origin: &str) -> Result<i64> {
  conn.execute(
- "INSERT INTO projects (name, version, origin) VALUES (?1, ?2, ?3)",
- params![name, version, origin],
+ "INSERT INTO projects (name, origin) VALUES (?1, ?2)",
+ params![name, origin],
  )?;
  Ok(conn.last_insert_rowid())
 }
@@ -187,15 +181,14 @@ pub fn create_tag(conn: &Connection, pid: i64, name: &str) -> Result<i64> {
 }
 
 pub fn get_projects(conn: &Connection) -> Result<Vec<ProjectInfo>> {
- let mut stmt = conn.prepare("SELECT OID, name, version, created_on, origin FROM projects")?;
+ let mut stmt = conn.prepare("SELECT OID, name, created_on, origin FROM projects")?;
  let rows = stmt
  .query_map([], |row| {
  Ok(ProjectInfo {
  id: row.get(0)?,
  name: row.get(1)?,
- version: row.get(2)?,
- created_on: row.get(3)?,
- origin: row.get(4)?,
+ created_on: row.get(2)?,
+ origin: row.get(3)?,
  })
  })?
  .filter_map(|entry| entry.ok())
@@ -205,15 +198,14 @@ pub fn get_projects(conn: &Connection) -> Result<Vec<ProjectInfo>> {
 
 pub fn get_project_by_name(conn: &Connection, name: &str) -> Result<ProjectInfo> {
  let project_info = conn.query_row(
- "SELECT OID, name, version, created_on, origin FROM projects WHERE name=:name",
+ "SELECT OID, name, created_on, origin FROM projects WHERE name=:name",
  params![name],
  |row| {
  Ok(ProjectInfo {
  id: row.get(0)?,
  name: row.get(1)?,
- version: row.get(2)?,
- created_on: row.get(3)?,
- origin: row.get(4)?,
+ created_on: row.get(2)?,
+ origin: row.get(3)?,
  })
  },
  )?;
@@ -222,15 +214,14 @@ pub fn get_project_by_name(conn: &Connection, name: &str) -> Result<ProjectInfo>
 
 pub fn get_project_by_snapshot(conn: &Connection, sid: i64) -> Result<ProjectInfo> {
  let project_info = conn.query_row(
- "SELECT p.OID, p.name, p.version, p.created_on, p.origin FROM snapshots s JOIN projects p ON p.OID = s.pid WHERE s.OID=:sid",
+ "SELECT p.OID, p.name, p.created_on, p.origin FROM snapshots s JOIN projects p ON p.OID = s.pid WHERE s.OID=:sid",
  params![sid],
  |row| {
  Ok(ProjectInfo {
  id: row.get(0)?,
  name: row.get(1)?,
- version: row.get(2)?,
- created_on: row.get(3)?,
- origin: row.get(4)?,
+ created_on: row.get(2)?,
+ origin: row.get(3)?,
  })
  },
  )?;

src/lib.rs

@@ -29,9 +29,7 @@ pub async fn run(config: &Config) -> Result<()> {
 
  let conn = db::create_connection(&config.output_dir)?;
  let package = PackageJsonFile::from_file(package_json_path)?;
-
  let name = package.name.unwrap();
- let version = package.version.unwrap();
 
  let pid = match db::get_project_by_name(&conn, &name) {
  Ok(project_info) => {
@@ -61,8 +59,7 @@ pub async fn run(config: &Config) -> Result<()> {
  Err(_) => {
  log::info!("Creating project `{}`", &name);
  let remote_url = project.remote_url()?;
- // TODO: version should be part of the snapshot as package.json values differ in branches/tags
- db::create_project(&conn, &name, &version, &remote_url)?
+ db::create_project(&conn, &name, &remote_url)?
  }
  };
 

src/server.rs

@@ -95,7 +95,6 @@ async fn get_snapshot_project(
  let project = db::get_project_by_snapshot(conn, sid).unwrap();
  let result = json!({
  "name": project.name,
- "version": project.version,
  "created_on": snapshot.created_on,
  "origin": project.origin,
  "branch": snapshot.branch,

static/index.html

@@ -35,9 +35,7 @@
  return html`
  <section class="hero is-primary">
  <div class="hero-body">
- <p class="title">
- ${project.name} ${project.version}
- </p>
+ <p class="title">${project.name}</p>
  <p class="subtitle">${project.created_on}</p>
  </div>
  </section>