Fixed linting issues
This commit is contained in:
15
.github/workflows/integration-tests.yml
vendored
15
.github/workflows/integration-tests.yml
vendored
@@ -35,10 +35,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
docker run -d \
|
docker run -d \
|
||||||
--name relspec-test-postgres \
|
--name relspec-test-postgres \
|
||||||
|
--network host \
|
||||||
-e POSTGRES_USER=relspec \
|
-e POSTGRES_USER=relspec \
|
||||||
-e POSTGRES_PASSWORD=relspec_test_password \
|
-e POSTGRES_PASSWORD=relspec_test_password \
|
||||||
-e POSTGRES_DB=relspec_test \
|
-e POSTGRES_DB=relspec_test \
|
||||||
-p 5432:5432 \
|
|
||||||
postgres:16-alpine
|
postgres:16-alpine
|
||||||
|
|
||||||
- name: Wait for PostgreSQL to be ready
|
- name: Wait for PostgreSQL to be ready
|
||||||
@@ -54,23 +54,18 @@ jobs:
|
|||||||
done
|
done
|
||||||
sleep 2
|
sleep 2
|
||||||
|
|
||||||
- name: Install PostgreSQL client
|
- name: Copy init script into container
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
docker cp tests/postgres/init.sql relspec-test-postgres:/tmp/init.sql
|
||||||
sudo apt-get install -y postgresql-client
|
|
||||||
|
|
||||||
- name: Initialize test database
|
- name: Initialize test database
|
||||||
env:
|
|
||||||
PGPASSWORD: relspec_test_password
|
|
||||||
run: |
|
run: |
|
||||||
psql -h localhost -U relspec -d relspec_test -f tests/postgres/init.sql
|
docker exec relspec-test-postgres psql -U relspec -d relspec_test -f /tmp/init.sql
|
||||||
|
|
||||||
- name: Verify database setup
|
- name: Verify database setup
|
||||||
env:
|
|
||||||
PGPASSWORD: relspec_test_password
|
|
||||||
run: |
|
run: |
|
||||||
echo "Verifying database initialization..."
|
echo "Verifying database initialization..."
|
||||||
psql -h localhost -U relspec -d relspec_test -c "
|
docker exec relspec-test-postgres psql -U relspec -d relspec_test -c "
|
||||||
SELECT
|
SELECT
|
||||||
(SELECT COUNT(*) FROM pg_namespace WHERE nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast') AND nspname NOT LIKE 'pg_%') as schemas,
|
(SELECT COUNT(*) FROM pg_namespace WHERE nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast') AND nspname NOT LIKE 'pg_%') as schemas,
|
||||||
(SELECT COUNT(*) FROM pg_tables WHERE schemaname NOT IN ('pg_catalog', 'information_schema')) as tables,
|
(SELECT COUNT(*) FROM pg_tables WHERE schemaname NOT IN ('pg_catalog', 'information_schema')) as tables,
|
||||||
|
|||||||
@@ -438,21 +438,22 @@ func (r *Reader) parseRelationshipConstraints(table *models.Table, structType *a
|
|||||||
var fkTable *models.Table
|
var fkTable *models.Table
|
||||||
var fkColumn, refTable, refColumn string
|
var fkColumn, refTable, refColumn string
|
||||||
|
|
||||||
if relType == "belongs-to" {
|
switch strings.ToLower(relType) {
|
||||||
|
case "belongs-to":
|
||||||
// For belongs-to: FK is on the current table
|
// For belongs-to: FK is on the current table
|
||||||
// join:user_id=id means table.user_id references referencedTable.id
|
// join:user_id=id means table.user_id references referencedTable.id
|
||||||
fkTable = table
|
fkTable = table
|
||||||
fkColumn = joinInfo.ForeignKey
|
fkColumn = joinInfo.ForeignKey
|
||||||
refTable = referencedTable.Name
|
refTable = referencedTable.Name
|
||||||
refColumn = joinInfo.ReferencedKey
|
refColumn = joinInfo.ReferencedKey
|
||||||
} else if relType == "has-many" {
|
case "has-many":
|
||||||
// For has-many: FK is on the referenced table
|
// For has-many: FK is on the referenced table
|
||||||
// join:id=user_id means referencedTable.user_id references table.id
|
// join:id=user_id means referencedTable.user_id references table.id
|
||||||
fkTable = referencedTable
|
fkTable = referencedTable
|
||||||
fkColumn = joinInfo.ReferencedKey
|
fkColumn = joinInfo.ReferencedKey
|
||||||
refTable = table.Name
|
refTable = table.Name
|
||||||
refColumn = joinInfo.ForeignKey
|
refColumn = joinInfo.ForeignKey
|
||||||
} else {
|
default:
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user