Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
56b123ea
Commit
56b123ea
authored
9 years ago
by
Allen Gilliland
Browse files
Options
Downloads
Plain Diff
Merge pull request #1881 from metabase/fix-dupe-fks
Fix dupe fks
parents
2775afa7
fc015c60
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/metabase/db/migrations.clj
+12
-0
12 additions, 0 deletions
src/metabase/db/migrations.clj
src/metabase/driver/sync.clj
+8
-7
8 additions, 7 deletions
src/metabase/driver/sync.clj
with
20 additions
and
7 deletions
src/metabase/db/migrations.clj
+
12
−
0
View file @
56b123ea
...
...
@@ -7,6 +7,7 @@
(
metabase.models
[
activity
:refer
[
Activity
]]
[
card
:refer
[
Card
]]
[
database
:refer
[
Database
]]
[
foreign-key
:refer
[
ForeignKey
]]
[
table
:refer
[
Table
]]
[
setting
:as
setting
])
[
metabase.sample-data
:as
sample-data
]
...
...
@@ -96,3 +97,14 @@
(
when-not
(
contains?
activity-feed-topics
:database-sync-begin
)
(
k/delete
Activity
(
k/where
{
:topic
"database-sync"
}))))
;; Clean up duplicate FK entries
(
defmigration
remove-duplicate-fk-entries
(
let
[
existing-fks
(
db/sel
:many
ForeignKey
)
grouped-fks
(
group-by
#
(
str
(
:origin_id
%
)
"_"
(
:destination_id
%
))
existing-fks
)]
(
doseq
[[
k
fks
]
grouped-fks
]
(
when
(
<
1
(
count
fks
))
(
log/debug
"Removing duplicate FK entries for"
k
)
(
doseq
[
duplicate-fk
(
drop-last
fks
)]
(
db/del
ForeignKey
:id
(
:id
duplicate-fk
)))))))
This diff is collapsed.
Click to expand it.
src/metabase/driver/sync.clj
+
8
−
7
View file @
56b123ea
...
...
@@ -476,18 +476,19 @@ infer-field-special-type
(
every?
:dest-column-name
fks
))
"table-fks should return a set of maps with keys :fk-column-name, :dest-table, and :dest-column-name."
)
(
when
(
seq
fks
)
(
let
[
fk-name->id
(
sel
:many
:field->id
[
Field
:name
]
,
:table_id
(
:id
table
)
,
:name
[
in
(
map
:fk-column-name
fks
)]
,
:parent_id
nil
)]
(
let
[
fk-name->id
(
sel
:many
:field->id
[
Field
:name
]
,
:table_id
(
:id
table
)
,
:name
[
in
(
map
:fk-column-name
fks
)]
,
:parent_id
nil
)]
(
doseq
[{
:keys
[
fk-column-name
dest-column-name
dest-table
]}
fks
]
(
when-let
[
fk-column-id
(
fk-name->id
fk-column-name
)]
(
when-let
[
dest-table-id
(
sel
:one
:field
[
Table
:id
]
,
:db_id
(
:db_id
table
)
:name
(
:name
dest-table
)
:schema
(
:schema
dest-table
))]
(
when-let
[
dest-column-id
(
sel
:one
:id
Field,
:table_id
dest-table-id,
:name
dest-column-name,
:parent_id
nil
)]
(
log/debug
(
u/format-color
'green
"Marking foreign key '%s.%s' -> '%s.%s'."
(
:name
table
)
fk-column-name
(
:name
dest-table
)
dest-column-name
))
(
ins
ForeignKey
:origin_id
fk-column-id
:destination_id
dest-column-id
;; TODO: do we even care about this?
;:relationship (determine-fk-type {:id fk-column-id, :table (delay table)}) ; fake a Field instance
:relationship
:Mt1
)
(
when-not
(
exists?
ForeignKey
:origin_id
fk-column-id,
:destination_id
dest-column-id
)
(
ins
ForeignKey
:origin_id
fk-column-id
:destination_id
dest-column-id
;; TODO: do we even care about this?
;:relationship (determine-fk-type {:id fk-column-id, :table (delay table)}) ; fake a Field instance
:relationship
:Mt1
))
(
upd
Field
fk-column-id
:special_type
:fk
))))))))))
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment