增加Mssql和Postgres schema选项 #713
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wonderflow
reviewed
Aug 17, 2018
reader/sql/sql.go
Outdated
| schemas: schemas, | ||
| encoder: encoder, | ||
| postgresSchema: pgSchema, | ||
| mssqlSchema: mssqlSchema, |
wonderflow
suggested changes
Aug 20, 2018
reader/sql/sql.go
Outdated
| @@ -166,6 +166,7 @@ func NewReader(meta *reader.Meta, conf conf.MapConf) (reader.Reader, error) { | |||
| readBatch, _ = conf.GetIntOr(reader.KeyMssqlReadBatch, 100) | |||
| offsetKey, _ = conf.GetStringOr(reader.KeyMssqlOffsetKey, "") | |||
| dataSource, err = conf.GetString(reader.KeyMssqlDataSource) | |||
| dbSchema, _ = conf.GetStringOr(reader.KeyMssqlSchema, "dbo") | |||
| if err != nil { | |||
There was a problem hiding this comment.
这行 if err!=nil是紧跟着 dataSource的，你插入的这一行要么放在dataSource上面，要么放在error判断下面，不要放在中间
reader/sql/sql.go
Outdated
| @@ -184,6 +185,7 @@ func NewReader(meta *reader.Meta, conf conf.MapConf) (reader.Reader, error) { | |||
| readBatch, _ = conf.GetIntOr(reader.KeyPGsqlReadBatch, 100) | |||
| offsetKey, _ = conf.GetStringOr(reader.KeyPGsqlOffsetKey, "") | |||
| dataSource, err = conf.GetString(reader.KeyPGsqlDataSource) | |||
| dbSchema, _ = conf.GetStringOr(reader.KeyPGsqlSchema, "public") | |||
wonderflow
approved these changes
Aug 20, 2018
|
lgtm |
|
ping @redHJ |
redHJ
reviewed
Aug 20, 2018
reader/rest_reader_models.go
Outdated
| ChooseOnly: false, | ||
| Placeholder: "<schema>", | ||
| DefaultNoUse: true, | ||
| Description: "数据库架构名称(mssql_schema)", |
There was a problem hiding this comment.
数据库 schema ？(我找了一下中文，基本都是叫架构或者模式，也不知道哪个好)
redHJ
reviewed
Aug 20, 2018
reader/rest_reader_models.go
Outdated
| Placeholder: "<schema>", | ||
| DefaultNoUse: true, | ||
| Description: "数据库架构名称(mssql_schema)", | ||
| ToolTip: "数据库架构名称", |
There was a problem hiding this comment.
开始想用模式，看到sqlserver 也有有用架构一词的，模式应该更通俗点
redHJ
reviewed
Aug 20, 2018
reader/rest_reader_models.go
Outdated
| Placeholder: "<schema>", | ||
| DefaultNoUse: true, | ||
| Description: "数据库架构名称(postgres_schema)", | ||
| ToolTip: "数据库架构名称", |
|
lgtm |
9 tasks
redHJ
added a commit
that referenced
this pull request
Nov 4, 2019
logkit s3 和 cloudtrail 元数据目录生成逻辑不依赖ak/sk #713
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes [issue number]
Changes