Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix sql.trx_view and MaskingColumns column_comment #1175

Merged
merged 4 commits into from
Sep 16, 2021
Merged

fix sql.trx_view and MaskingColumns column_comment #1175

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
742c1e0
fix sql.trx_view
GloomyNAN Aug 31, 2021
07354b2
fix MaskingColumn column_comment
GloomyNAN Sep 1, 2021
3f0daa0
add masking.sh
GloomyNAN Sep 2, 2021
36b5677
Merge branch 'master' into master
hhyo Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class QueryPrivilegesApplyAdmin(admin.ModelAdmin):
@admin.register(DataMaskingColumns)
class DataMaskingColumnsAdmin(admin.ModelAdmin):
list_display = (
'column_id', 'rule_type', 'active', 'instance', 'table_schema', 'table_name', 'column_name',
'column_id', 'rule_type', 'active', 'instance', 'table_schema', 'table_name', 'column_name', 'column_comment',
'create_time',)
search_fields = ['table_name', 'column_name']
list_filter = ('rule_type', 'active', 'instance__instance_name')
Expand Down
2 changes: 1 addition & 1 deletion sql/db_diagnostic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ def innodb_trx(request):
ON trx.trx_mysql_thread_id = p.id
WHERE trx.trx_state = 'RUNNING'
AND p.COMMAND = 'Sleep'
AND P.time > 3
AND p.time > 3
ORDER BY trx.trx_started ASC;'''

query_result = query_engine.query('information_schema', sql)
Expand Down