rebase xorm:master #1

brookechen · 2023-07-10T11:58:46Z

brookechen commented

2023-07-10 11:58:46 +00:00

No description provided.

brookechen added 6 commits 2023-07-10 11:58:49 +00:00

some optimzation (#2272 )

Reviewed-on: xorm/xorm#2272

caa8a029c6

ccbhj/fix_mysql_blob_shared_bytes (#2274 )

Copy the sql.RawBytes when converting to []byte.
Fix issue xorm/xorm#2273

Co-authored-by: Bingjia Chen <bingjia.chen@seamoney.com>
Reviewed-on: xorm/xorm#2274
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: ccbhj <ccbhj@noreply.gitea.com>
Co-committed-by: ccbhj <ccbhj@noreply.gitea.com>

838a0d9bca

Don't warn when database have extra columns which are not in struct (#2279 )

Reviewed-on: xorm/xorm#2279

068de8c0f8

Default don't log warn for database extra columns when syncing (#2280 )

Reviewed-on: xorm/xorm#2280

18f8e7a86c

Mysql support a new tag Collate (#2283 )

Fix #237
Fix #2179

Reviewed-on: xorm/xorm#2283

d29fe49933

chore: ignore unnecessary char type cast in GetColumns (#2278 )

PostgreSQL有两种char类型：`character`和`"char"`: https://www.postgresql.org/docs/current/datatype-character.html.

`pg_class`里的`relkind`是`"char"`类型，所以`GetColumns`这里应该转成`::"char"`或者和本PR里请求的一样去掉转换。这样对于PostgreSQL以及其他兼容PostgreSQL的数据库容错性更好，在做比较时它们通常都会被隐式转换。
```sql
postgres=# select pg_typeof(relkind), pg_typeof('a'::char), pg_typeof('a'::"char") from pg_class limit 1;
 pg_typeof | pg_typeof | pg_typeof
-----------+-----------+-----------
 "char"    | character | "char"
(1 row)
```

Co-authored-by: August <pin@singularity-data.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-on: xorm/xorm#2278
Co-authored-by: flyingpigge <flyingpigge@noreply.gitea.com>
Co-committed-by: flyingpigge <flyingpigge@noreply.gitea.com>

52b01ce67f

lunny added 1 commit 2023-07-11 17:10:44 +00:00

In SQLite3, Sync doesn't support Modify Column：Error: near MODIFY: syntax error (#2267 )

rebase

Co-authored-by: brookechen <brookechen@noreply.gitea.io>
Co-authored-by: brookechen <brookechen@tencent.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Reviewed-on: xorm/xorm#2267
Co-authored-by: brookechen <brookechen@noreply.gitea.com>
Co-committed-by: brookechen <brookechen@noreply.gitea.com>

486c344ba3

lunny added 1 commit 2023-07-12 02:02:06 +00:00

Fix join problem (#2291 )

Fix #2284

Reviewed-on: xorm/xorm#2291

79a8bc804b

brookechen merged commit f1104631a9 into master

2023-07-12 02:38:49 +00:00

brookechen referenced this issue from a commit

2023-07-12 02:38:52 +00:00

Merge pull request 'rebase xorm:master' (#1) from xorm/xorm:master into master

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No Assignees

2 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: brookechen/xorm#1