1
Fork 0

Improve codeql action + fix test db clean

This commit is contained in:
viktorstrate 2021-04-24 19:12:45 +02:00
parent 761db0639d
commit d09d5f6ca0
No known key found for this signature in database
GPG Key ID: 3F855605109C1E8A
2 changed files with 20 additions and 33 deletions

View File

@ -15,35 +15,26 @@ jobs:
if: github.repository == 'photoview/photoview'
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
# strategy:
# fail-fast: false
# matrix:
# Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ['go', 'javascript']
# language: ['go', 'javascript']
# Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2
- name: Checkout repository
uses: actions/checkout@v2
# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: go, javascript
# Run further tests
queries: security-extended, security-and-quality
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# Run further tests
queries: security-extended, security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1

View File

@ -190,21 +190,17 @@ func MigrateDatabase(db *gorm.DB) error {
func ClearDatabase(db *gorm.DB) error {
err := db.Transaction(func(tx *gorm.DB) error {
if err := tx.Exec("SET FOREIGN_KEY_CHECKS = 0;").Error; err != nil {
return err
}
sess := tx.Session(&gorm.Session{AllowGlobalUpdate: true})
dry_run := tx.Session(&gorm.Session{DryRun: true})
for _, model := range database_models {
if err := sess.Delete(model).Error; err != nil {
// get table name of model structure
table := dry_run.Find(model).Statement.Table
if err := tx.Exec(fmt.Sprintf("TRUNCATE TABLE %s", table)).Error; err != nil {
return err
}
}
if err := tx.Exec("SET FOREIGN_KEY_CHECKS = 1;").Error; err != nil {
return err
}
return nil
})