From bee355eb650461c770686f9293ec1f006f9e621a Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Thu, 19 Jan 2023 09:45:07 +0200 Subject: [PATCH] all: cleanup sqlite.connect statements (do not leave strange test.db or vweb.sql artefacts around, after running common tests) --- cmd/tools/vcreate.v | 4 ++-- examples/vweb_fullstack/src/auth_services.v | 2 +- .../vweb_fullstack/src/databases/config_databases_sqlite.v | 2 +- vlib/v/tests/orm_stmt_wrong_return_checking_test.v | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/tools/vcreate.v b/cmd/tools/vcreate.v index 5422e48c3..d842a7282 100644 --- a/cmd/tools/vcreate.v +++ b/cmd/tools/vcreate.v @@ -304,7 +304,7 @@ fn (mut c Create) set_web_project_files() { import db.sqlite // can change to 'db.mysql', 'db.pg' pub fn create_db_connection() !sqlite.DB { - mut db := sqlite.connect('vweb.sql')! + mut db := sqlite.connect('app.db')! return db } " @@ -500,7 +500,7 @@ fn (mut app App) service_auth(username string, password string) !string { } defer { - db.close() or { panic('fail to close database') } + db.close() or { panic(err) } } user := sql db { diff --git a/examples/vweb_fullstack/src/auth_services.v b/examples/vweb_fullstack/src/auth_services.v index dfffe7d9b..28861f2f0 100644 --- a/examples/vweb_fullstack/src/auth_services.v +++ b/examples/vweb_fullstack/src/auth_services.v @@ -31,7 +31,7 @@ fn (mut app App) service_auth(username string, password string) !string { } defer { - db.close() or { panic('fail to close database') } + db.close() or { panic(err) } } user := sql db { diff --git a/examples/vweb_fullstack/src/databases/config_databases_sqlite.v b/examples/vweb_fullstack/src/databases/config_databases_sqlite.v index efb90c92c..df58d89af 100644 --- a/examples/vweb_fullstack/src/databases/config_databases_sqlite.v +++ b/examples/vweb_fullstack/src/databases/config_databases_sqlite.v @@ -3,6 +3,6 @@ module databases import db.sqlite // can change to 'db.mysql', 'db.pg' pub fn create_db_connection() !sqlite.DB { - mut db := sqlite.connect('vweb.sql')! + mut db := sqlite.connect('app.db')! return db } diff --git a/vlib/v/tests/orm_stmt_wrong_return_checking_test.v b/vlib/v/tests/orm_stmt_wrong_return_checking_test.v index 0102d88f8..9ccfbbf41 100644 --- a/vlib/v/tests/orm_stmt_wrong_return_checking_test.v +++ b/vlib/v/tests/orm_stmt_wrong_return_checking_test.v @@ -7,7 +7,7 @@ pub mut: } fn add_target(repo Target) !int { - mut dbs := sqlite.connect('test.db')! + mut dbs := sqlite.connect(':memory:')! defer { dbs.close() or { panic(err) } } -- 2.30.2