rename sqlite_call_wrapper to sqlite_call

This commit is contained in:
vms 2019-08-17 22:59:09 +03:00
parent 8bc7ac36b2
commit 4c9f85ca68
4 changed files with 13 additions and 13 deletions

View File

@ -3,7 +3,7 @@ use fluence::sdk::*;
pub mod errors;
pub mod utils;
use crate::utils::sqlite_call_wrapper;
use crate::utils::sqlite_call;
fn init() {
logger::WasmLogger::init_with_level(log::Level::Info).unwrap();
@ -12,11 +12,11 @@ fn init() {
#[invocation_handler(init_fn = init, side_modules = sqlite)]
fn run(nickname: String) -> String {
// Create table for messages storage
sqlite_call_wrapper("CREATE TABLE messages(message text, username text)")
sqlite_call("CREATE TABLE messages(message text, username text)")
.expect("error on CREATE TABLE");
// Insert message 'Hello, username!' using `nickname` as author's username
sqlite_call_wrapper(
sqlite_call(
format!(
r#"INSERT INTO messages VALUES("{}","{}")"#,
"Hello, username!", nickname
@ -26,11 +26,11 @@ fn run(nickname: String) -> String {
.expect("error on INSERT INTO");
// Get all messages
let messages = sqlite_call_wrapper("SELECT * FROM messages").expect("error on SELECT *");
let messages = sqlite_call("SELECT * FROM messages").expect("error on SELECT *");
log::info!("messages: {:?}", messages);
// Get all messages as JSON via SQLite's JSON extension
sqlite_call_wrapper(
sqlite_call(
"SELECT json_group_array(
json_object('message', message, 'username', username)
) AS json_result FROM (SELECT * FROM messages)",

View File

@ -1,7 +1,7 @@
use crate::errors::{err_msg, AppResult};
use crate::sqlite;
pub fn sqlite_call_wrapper(bytes: &str) -> AppResult<String> {
pub fn sqlite_call(bytes: &str) -> AppResult<String> {
let response = sqlite::call(bytes.as_bytes());
// Decode query result to a utf8 string

View File

@ -2,14 +2,14 @@ use std::str::FromStr;
use crate::errors::err_msg;
use crate::errors::AppResult;
use crate::utils::sqlite_call_wrapper;
use crate::utils::sqlite_call;
pub fn create_scheme() -> AppResult<()> {
sqlite_call_wrapper("CREATE TABLE messages(message text, username text)").map(drop)
sqlite_call("CREATE TABLE messages(message text, username text)").map(drop)
}
pub fn add_post(message: String, username: String) -> AppResult<()> {
sqlite_call_wrapper(
sqlite_call(
format!(
r#"INSERT INTO messages VALUES("{}","{}")"#,
message, username
@ -20,7 +20,7 @@ pub fn add_post(message: String, username: String) -> AppResult<()> {
}
pub fn get_all_posts() -> AppResult<String> {
sqlite_call_wrapper(
sqlite_call(
"SELECT json_group_array(
json_object('message', message, 'username', username)
) AS json_result FROM (SELECT * FROM messages)",
@ -28,7 +28,7 @@ pub fn get_all_posts() -> AppResult<String> {
}
pub fn get_posts_by_username(username: String) -> AppResult<String> {
sqlite_call_wrapper(
sqlite_call(
format!(
"SELECT json_group_array(
json_object('message', message, 'username', username)
@ -40,7 +40,7 @@ pub fn get_posts_by_username(username: String) -> AppResult<String> {
}
pub fn get_posts_count() -> AppResult<i32> {
let result = sqlite_call_wrapper("SELECT COUNT(*) from messages")?;
let result = sqlite_call("SELECT COUNT(*) from messages")?;
i32::from_str(result.as_str()).map_err(|e| {
err_msg(&format!(

View File

@ -1,7 +1,7 @@
use crate::errors::{err_msg, AppResult};
use crate::sqlite;
pub fn sqlite_call_wrapper(bytes: &str) -> AppResult<String> {
pub fn sqlite_call(bytes: &str) -> AppResult<String> {
let response = sqlite::call(bytes.as_bytes());
// Decode query result to a utf8 string