Skip to content

Commit dcf14ba

Browse files
committed
reduce setup process and fix sqlite issue
1 parent 0b28ac5 commit dcf14ba

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

server/db.js

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,30 @@
22
const sqlite3 = require("sqlite3").verbose();
33

44
// create a db instance
5-
const db = new sqlite3.Database("./user.sqlite3", err => {
5+
const db = new sqlite3.Database("./db.sqlite3", err => {
6+
67
if (err) {
78
console.log("Error when creating the database", err);
89
} else {
9-
console.log("Database created!");
1010
createTableUser();
1111
createTableService();
12+
console.log("Database created!");
1213
}
1314
});
1415

16+
const options = {
17+
client: "sqlite3",
18+
connection: {
19+
filename: "./db.sqlite3"
20+
},
21+
useNullAsDefault: true
22+
};
23+
1524
const createTableUser = () => {
16-
const options = {
17-
client: "sqlite3",
18-
connection: {
19-
filename: "./user.sqlite3"
20-
}
21-
};
25+
2226
const knex = require("knex")(options);
27+
if(knex.schema.hasTable("users")) return;
28+
2329
knex.schema
2430
.createTable("users", function(t) {
2531
t.increments("id").primary();
@@ -28,17 +34,14 @@ const createTableUser = () => {
2834
t.string("password").notNullable();
2935
})
3036
.then(console.log("User Table created"));
31-
// // db.run("CREATE TABLE IF NOT EXISTS users(id INTEGER PRIMARY KEY AUTOINCREMENT, email TEXT UNIQUE, username TEXT, password TEXT)");
37+
// db.run("CREATE TABLE IF NOT EXISTS users(id INTEGER PRIMARY KEY AUTOINCREMENT, email TEXT UNIQUE, username TEXT, password TEXT)");
3238
};
3339

3440
const createTableService = () => {
35-
const options = {
36-
client: "sqlite3",
37-
connection: {
38-
filename: "./user.sqlite3"
39-
}
40-
};
41+
4142
const knex = require("knex")(options);
43+
if(knex.schema.hasTable("services")) return;
44+
4245
knex.schema
4346
.createTable("services", function(t) {
4447
t.increments("id").primary();
@@ -47,7 +50,8 @@ const createTableService = () => {
4750
t.string("type").notNullable();
4851
t.string("location").notNullable();
4952
})
50-
.then(console.log("Service Table created"));
53+
.then(console.log("Service Table created"))
54+
5155

5256
knex.schema
5357
.alterTable("services", function(t) {

server/db.sqlite3

Whitespace-only changes.

server/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"license": "ISC",
1212
"dependencies": {
1313
"async": "^3.1.0",
14+
"azure-arm-apimanagement": "^5.1.0",
1415
"bcryptjs": "^2.4.3",
1516
"body-parser": "^1.19.0",
1617
"cookie-parser": "^1.4.4",

server/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ app.set("port", process.env.PORT || 4000);
66
app.use(express.static("public"));
77
app.use(cors());
88

9-
// const db = require("../server/db");
9+
const db = require("../server/db");
1010

1111
const authRoutes = require("./routes/auth");
1212
app.use("/", authRoutes);

0 commit comments

Comments
 (0)