Skip to content

Commit 6c3d347

Browse files
waitingsongwaitingsong
committed
Merge remote-tracking branch 'bp/main'
2 parents 0451c1e + d36ac91 commit 6c3d347

File tree

14 files changed

+119
-43
lines changed

14 files changed

+119
-43
lines changed

‎.env

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
# POSTGRES_HOST="127.0.0.1"
55
# POSTGRES_PORT=5432
66
# POSTGRES_DB=db_ci_test
7-
# POSTGRES_USER=postgres
8-
# POSTGRES_PASSWORD=postgres
7+
# POSTGRES_USER=dbuser
8+
# POSTGRES_PASSWORD=dbuser
99

1010
# PGMQ_HOST="127.0.0.1"
1111
# PGMQ_PORT=5432
12-
# PGMQ_DB=postgres
13-
# PGMQ_USER=postgres
14-
# PGMQ_PASSWORD=postgres
12+
# PGMQ_DB=db_ci_test
13+
# PGMQ_USER=dbuser
14+
# PGMQ_PASSWORD=dbuser
1515

1616
# PARADEDB_HOST="127.0.0.1"
1717
# PARADEDB_PORT=5432
1818
# PARADEDB_DB=db_ci_test
19-
# PARADEDB_USER=postgres
20-
# PARADEDB_PASSWORD=postgres
19+
# PARADEDB_USER=dbuser
20+
# PARADEDB_PASSWORD=dbuser
2121

‎.githooks/init-repo.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ if [ -z "$CI" ]; then
2525
git config --local remote.origin.prune true
2626
git config --local remote.origin.tagopt --tags
2727
git config --local remote.pushdefault origin
28+
git config --local rerere.enabled true
2829
fi;
2930

30-
echo It may going for a long time. Plese wait...
31+
echo It may going for a long time. Please wait...
3132
.githooks/gen-file-from-example.mts
3233

3334
lerna list

‎.github/workflows/nodejs.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,13 @@ jobs:
6464
run: |
6565
psql -V
6666
dig postgres
67-
echo "\l" | psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d postgres
6867
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -c "SELECT version();"
69-
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -c "\d+"
70-
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -c "SHOW TIMEZONE;"
7168
env:
7269
CI: true
7370
POSTGRES_HOST: postgres
7471
POSTGRES_PORT: 5432
7572
POSTGRES_DB: db_ci_test
7673
POSTGRES_USER: postgres
77-
POSTGRES_PASSWORD: postgres
7874
PGPASSWORD: postgres
7975

8076
- name: Install Dependencies
@@ -118,8 +114,10 @@ jobs:
118114
POSTGRES_PORT: 5432
119115
POSTGRES_DB: db_ci_test
120116
POSTGRES_USER: postgres
121-
POSTGRES_PASSWORD: postgres
117+
POSTGRES_PWD: postgres
122118
PGPASSWORD: postgres
119+
DBUSER: dbuser
120+
DBUSER_PWD: dbuser
123121

124122
- name: Testing
125123
run: |
@@ -135,9 +133,8 @@ jobs:
135133
POSTGRES_HOST: postgres
136134
POSTGRES_PORT: 5432
137135
POSTGRES_DB: db_ci_test
138-
POSTGRES_USER: postgres
139-
POSTGRES_PASSWORD: postgres
140-
PGPASSWORD: postgres
136+
POSTGRES_USER: dbuser
137+
POSTGRES_PWD: dbuser
141138
# redis
142139
REDIS_HOST: redis
143140
REDIS_PORT: 6379

‎.github/workflows/npm-manual-publish.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,25 +80,21 @@ jobs:
8080
npm whoami
8181
psql -V
8282
dig postgres
83-
echo "\l" | psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d postgres
8483
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -c "SELECT version();"
85-
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -c "\d+"
86-
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -c "SHOW TIMEZONE;"
8784
env:
8885
CI: true
8986
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
9087
POSTGRES_HOST: postgres
9188
POSTGRES_PORT: 5432
9289
POSTGRES_DB: db_ci_test
9390
POSTGRES_USER: postgres
94-
POSTGRES_PASSWORD: postgres
9591
PGPASSWORD: postgres
9692

9793
- name: Install Dependencies
9894
timeout-minutes: 15
9995
run: |
10096
export cwd=`pwd`
101-
npm i --no-audit -g lerna rollup tsx zx madge
97+
npm i --no-audit -g lerna madge tsx zx rollup
10298
npm i --no-audit
10399
env:
104100
CI: true
@@ -135,8 +131,10 @@ jobs:
135131
POSTGRES_PORT: 5432
136132
POSTGRES_DB: db_ci_test
137133
POSTGRES_USER: postgres
138-
POSTGRES_PASSWORD: postgres
134+
POSTGRES_PWD: postgres
139135
PGPASSWORD: postgres
136+
DBUSER: dbuser
137+
DBUSER_PWD: dbuser
140138

141139
- name: Testing
142140
run: |
@@ -153,9 +151,8 @@ jobs:
153151
POSTGRES_HOST: postgres
154152
POSTGRES_PORT: 5432
155153
POSTGRES_DB: db_ci_test
156-
POSTGRES_USER: postgres
157-
POSTGRES_PASSWORD: postgres
158-
PGPASSWORD: postgres
154+
POSTGRES_USER: dbuser
155+
POSTGRES_PWD: dbuser
159156
# redis
160157
REDIS_HOST: redis
161158
REDIS_PORT: 6379

‎.scripts/ci/ci-init-db.sh

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@ psql -V
55
# netstat -tunpl
66
# dig postgres
77

8-
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -c "SELECT version();"
9-
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -c "SHOW TIMEZONE;"
10-
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -c "SELECT extname, extversion FROM pg_extension;"
11-
8+
export PGPASSWORD="$POSTGRES_PWD"
9+
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -bq -f $cwd/.scripts/ci/init-pre.sql
1210
echo -e "\n"
1311

14-
# SQL_DIR='./packages/demo/database/'
12+
SQL_DIR="$cwd/packages/demo/database/"
13+
cd "$SQL_DIR"
14+
. ./init-db.sh
1515

16-
# cd "$SQL_DIR"
17-
# pwd
18-
# . ./init-db.sh
19-
# cd -
16+
echo -e "\nInit post"
17+
export PGPASSWORD="$POSTGRES_PWD"
18+
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -f $cwd/.scripts/ci/init-post.sql
2019

‎.scripts/ci/init-post.sql

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
SHOW TIMEZONE;
3+
SELECT e.extname AS extension_name,
4+
n.nspname AS schema_name, r.rolname AS owner FROM pg_extension e
5+
JOIN pg_authid r ON e.extowner = r.oid JOIN pg_catalog.pg_namespace n ON n.oid = e.extnamespace;
6+
SELECT usename, usecreatedb, usesuper, userepl, usebypassrls, valuntil, useconfig FROM pg_catalog.pg_user;
7+
\d+;
8+
\du+;
9+

‎.scripts/ci/init-pre.sql

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
CREATE USER dbuser WITH PASSWORD 'dbuser';
3+
4+
-- 授予 dbuser 用户连接权限
5+
GRANT CONNECT ON DATABASE db_ci_test TO dbuser;
6+
7+
-- 授予数据库的所有权限
8+
GRANT ALL PRIVILEGES ON DATABASE db_ci_test TO dbuser;
9+
10+
-- 授予 dbuser 用户对所有表的 SELECT, INSERT, UPDATE, DELETE 权限
11+
-- GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO dbuser;
12+
GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO dbuser;
13+
14+
-- 授予 dbuser 用户对所有序列的 USAGE 和 SELECT 权限
15+
GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO dbuser;
16+
17+
-- 确保未来对新表、视图和序列的权限自动生效
18+
-- ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON TABLES TO dbuser;
19+
ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT USAGE, SELECT ON SEQUENCES TO dbuser;
20+
ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT SELECT, INSERT, UPDATE, DELETE ON TABLES TO dbuser;
21+
22+
GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO dbuser;
23+
24+
-- 确认当前用户是否有权限
25+
SELECT * FROM pg_roles WHERE rolname = 'dbuser';
26+
SELECT * FROM pg_catalog.pg_user;
27+
SELECT * FROM pg_database ;
28+

‎package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@
88
"@commitlint/cli": "19",
99
"@commitlint/config-conventional": "19",
1010
"@midwayjs/mock": "^3.19.0",
11-
"@midwayjs/swagger": "^3.19.0",
12-
"@midwayjs/validate": "^3.19.0",
11+
"@midwayjs/swagger": "3",
12+
"@midwayjs/validate": "3",
1313
"@types/koa": "2",
1414
"@types/mocha": "10",
1515
"@types/node": "22",
16-
"@waiting/eslint-config": "^15.1.0",
17-
"@waiting/shared-core": "^23.23.0",
18-
"@waiting/shared-types": "^23.22.0",
16+
"@waiting/eslint-config": "^15.2.2",
17+
"@waiting/shared-core": "23",
18+
"@waiting/shared-types": "23",
1919
"autocannon": "8",
2020
"cross-env": "7",
21-
"mocha": "10",
22-
"mwtsc": "^1.12.0",
21+
"mocha": "11",
22+
"mwtsc": "^1.15.1",
2323
"swagger-ui-dist": "^5.18.2",
2424
"ts-node": "^10.9.2",
2525
"tsc-alias": "^1.8.10",
26-
"typescript": "^5.6.3"
26+
"typescript": "^5.7.3"
2727
},
2828
"engines": {
2929
"node": ">=20.11.0"

‎packages/ali-oss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@yuntools/ali-oss": "^16.1.5"
4444
},
4545
"engines": {
46-
"node": ">=18.12.0",
46+
"node": ">=20.11.0",
4747
"@midwayjs/core": ">=3.16.0"
4848
},
4949
"files": [

‎packages/demo/database/default/ddl/ci-config.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
SELECT pg_reload_conf();
3+
4+
-- SET search_path TO "$user", public, pgmq;
5+

‎packages/demo/database/default/ddl/tb_user.sql

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
--
3+
CREATE TABLE tb_user (
4+
uid int8 GENERATED ALWAYS AS IDENTITY NOT NULL,
5+
user_name varchar(60) NOT NULL,
6+
PRIMARY KEY (uid),
7+
ctime TIMESTAMP(6) NOT NULL DEFAULT now(),
8+
mtime TIMESTAMP(6)
9+
);
10+
CREATE INDEX idx_tb_user_user_name ON tb_user(ctime);
11+

‎packages/demo/database/default/ddl/tb_user_insert.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
--
3+
INSERT INTO tb_user (user_name) VALUES ('admin');
4+
SELECT * FROM tb_user;
5+

‎packages/demo/database/default/init.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
set -e
3+
4+
echo -e "\n"
5+
6+
export PGPASSWORD="$POSTGRES_PWD"
7+
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$POSTGRES_USER -d $POSTGRES_DB -bq \
8+
-f ddl/ci-config.sql \
9+
-f ddl/tb_user.sql \
10+
11+
export PGPASSWORD="$DBUSER_PWD"
12+
psql -h $POSTGRES_HOST -p $POSTGRES_PORT -U$DBUSER -d $POSTGRES_DB \
13+
-f ddl/tb_user_insert.sql \
14+

‎packages/demo/database/init-db.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
set -e
3+
4+
echo -e "\n"
5+
6+
SQL_DIR='default'
7+
cd "$SQL_DIR"
8+
. ./init.sh
9+
cd -
10+

0 commit comments

Comments
 (0)