From bab5c27cee2ad11306b54521a366a9e7d6691153 Mon Sep 17 00:00:00 2001 From: Jeff Baskin Date: Fri, 30 Dec 2022 22:09:36 -0500 Subject: [PATCH] Removed the unused interprater code. --- src/morethantext/graphql.rs | 179 ----------------------------------- src/morethantext/mttsql.pest | 6 -- 2 files changed, 185 deletions(-) delete mode 100644 src/morethantext/graphql.rs delete mode 100644 src/morethantext/mttsql.pest diff --git a/src/morethantext/graphql.rs b/src/morethantext/graphql.rs deleted file mode 100644 index 67ea004..0000000 --- a/src/morethantext/graphql.rs +++ /dev/null @@ -1,179 +0,0 @@ -use async_graphql::{Context, EmptySubscription, Error, Object, Result, Schema}; -use async_std::sync::RwLock; -use serde_json; - -mod database; - -#[derive(Clone)] -struct Table { - name: String, -} - -impl Table { - async fn new(name: String) -> Self { - Self { name: name } - } -} - -#[Object] -impl Table { - async fn name(&self) -> String { - self.name.to_string() - } - - async fn describe(&self) -> Vec { - Vec::new() - } -} - -struct Query; - -#[Object] -impl Query { - async fn table(&self, ctx: &Context<'_>, name: String) -> Result> { - let tbls = ctx - .data::>>() - .unwrap() - .read() - .await - .to_vec(); - match tbls.binary_search_by(|t| t.name.cmp(&name)) { - Ok(idx) => Ok(Some(tbls[idx].clone())), - Err(_) => Ok(None), - } - } - - async fn tables(&self, ctx: &Context<'_>) -> Vec { - ctx.data::>>() - .unwrap() - .read() - .await - .to_vec() - } -} - -struct Mutation; - -#[Object] -impl Mutation { - async fn create_table(&self, ctx: &Context<'_>, name: String) -> Result> { - let mut tables = ctx.data::>>().unwrap().write().await; - match tables.binary_search_by(|t| t.name.cmp(&name)) { - Ok(_) => Err(Error::new(format!("Table {} already exists.", &name))), - Err(_) => { - let output = Table::new(name).await; - tables.push(output.clone()); - tables.sort_by_key(|k| k.name.clone()); - Ok(Some(output)) - } - } - } -} - -#[derive(Clone)] -pub struct MoreThanText { - schema: Schema, -} - -impl MoreThanText { - pub fn new() -> Self { - let tables: Vec
= Vec::new(); - Self { - schema: Schema::build(Query, Mutation, EmptySubscription) - .data(RwLock::new(tables)) - .finish(), - } - } - - pub async fn execute(&self, qry: &str) -> String { - let res = self.schema.execute(qry).await; - serde_json::to_string(&res).unwrap() - } -} - -#[cfg(test)] -mod support { - use super::*; - - pub fn compare(db: &MoreThanText, output: &str, expected: &str) { - assert!( - output == expected, - "\n\n{}\nGot: {}\nWant: {}\n\n", - db.schema.sdl(), - output, - expected - ); - } -} - -#[cfg(test)] -mod queries { - use super::*; - - #[async_std::test] - async fn list_table() { - let db = MoreThanText::new(); - db.execute(r#"mutation {createTable(name: "wilma"){name}}"#) - .await; - db.execute(r#"mutation {createTable(name: "betty"){name}}"#) - .await; - let output = db.execute(r#"{table(name: "wilma"){name}}"#).await; - let expected = r#"{"data":{"table":{"name":"wilma"}}}"#; - support::compare(&db, &output, &expected); - } - - #[async_std::test] - async fn list_no_table() { - let db = MoreThanText::new(); - let output = db.execute(r#"{table(name: "slade"){name}}"#).await; - let expected = r#"{"data":{"table":null}}"#; - support::compare(&db, &output, &expected); - } - - #[async_std::test] - async fn list_tables() { - let db = MoreThanText::new(); - db.execute(r#"mutation {createTable(name: "fred"){name}}"#) - .await; - db.execute(r#"mutation {createTable(name: "barney"){name}}"#) - .await; - let output = db.execute(r#"{tables{name}}"#).await; - let expected = r#"{"data":{"tables":[{"name":"barney"},{"name":"fred"}]}}"#; - support::compare(&db, &output, &expected); - } - - #[async_std::test] - async fn empty_table_description() { - let db = MoreThanText::new(); - let output = db - .execute(r#"mutation {createTable(name: "pebbles"){name describe}}"#) - .await; - let expected = r#"{"data":{"createTable":{"name":"pebbles","describe":[]}}}"#; - support::compare(&db, &output, &expected); - } -} - -#[cfg(test)] -mod mutations { - use super::*; - - #[async_std::test] - async fn add_table() { - let db = MoreThanText::new(); - let output = db - .execute(r#"mutation {createTable(name: "william"){name}}"#) - .await; - let expected = r#"{"data":{"createTable":{"name":"william"}}}"#; - support::compare(&db, &output, &expected); - } - - #[async_std::test] - async fn cannot_add_duplicate_table() { - let db = MoreThanText::new(); - let qry = r#"mutation {createTable(name: "gadzoo"){name}}"#; - db.execute(&qry).await; - let output = db.execute(qry).await; - let expected = r#"{"data":null,"errors":[{"message":"Table gadzoo already exists.","locations":[{"line":1,"column":11}],"path":["createTable"]}]}"#; - support::compare(&db, &output, &expected); - } -} diff --git a/src/morethantext/mttsql.pest b/src/morethantext/mttsql.pest deleted file mode 100644 index f16b4b7..0000000 --- a/src/morethantext/mttsql.pest +++ /dev/null @@ -1,6 +0,0 @@ -char = _{ ASCII_ALPHANUMERIC | "_" } -whitespace = _{" " | "\t" | "\r" | "\n"} - -name = {char+} -command = {"create database" ~ whitespace+ ~ name ~ ";"} -script = {command+}