Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
datalibaba
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
DREAL Pays de la Loire
Centre de Services de la Donnée
datalibaba
Commits
5c6cdec3
Commit
5c6cdec3
authored
3 years ago
by
Juliette Engelaere-Lefebvre
Browse files
Options
Downloads
Patches
Plain Diff
modif du nom de la table des propriétés des tables R pour respecter les bonnes pratique du SGBD
parent
75baab8f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#58786
passed
3 years ago
Stage: build
Stage: test
Stage: pkgdown
Stage: pkgdown-move
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
R/get_data.R
+3
-3
3 additions, 3 deletions
R/get_data.R
R/post_data.R
+6
-6
6 additions, 6 deletions
R/post_data.R
with
9 additions
and
9 deletions
R/get_data.R
+
3
−
3
View file @
5c6cdec3
...
...
@@ -88,15 +88,15 @@ importer_data <- function(table = NULL, schema = NULL, db = "production", server
# on recupere la liste des noms de champs de la table et leurs caracteristiques
champs
<-
rpostgis
::
dbTableInfo
(
conn
=
con
,
name
=
c
(
schema
,
table
),
allinfo
=
FALSE
)
if
(
DBI
::
dbExistsTable
(
conn
=
con
,
name
=
c
(
schema
,
"
.R
_df_def
s
"
)))
{
def_table
<-
DBI
::
dbReadTable
(
con
,
c
(
schema
,
"
.R
_df_def
s
"
))
%>%
if
(
DBI
::
dbExistsTable
(
conn
=
con
,
name
=
c
(
schema
,
"
zz_r
_df_def"
)))
{
def_table
<-
DBI
::
dbReadTable
(
con
,
c
(
schema
,
"
zz_r
_df_def"
))
%>%
dplyr
::
filter
(
.data
$
table_nm
==
table
)
if
(
nrow
(
def_table
)
==
0
)
{
message
(
paste0
(
"Pas de renseignements trouv\u00e9 sur "
,
table
,
" dans la table des propri\u00e9t\u00e9s des dataframes R, un import standard sera r\u00e9alis\u00e9. "
))
}
else
{
sql_query
<-
paste0
(
"SELECT unnest(df_def[1:1]) as nms, unnest(df_def[2:2]) as defs, unnest(df_def[3:3]) as atts, unnest(df_def[4:4]) as r_nms FROM "
,
schema
,
".\"
.R
_df_def
s
\" WHERE table_nm = '"
,
table
,
"';"
)
schema
,
".\"
zz_r
_df_def\" WHERE table_nm = '"
,
table
,
"';"
)
defs
<-
dbGetQuery
(
conn
=
con
,
sql_query
)
}
}
else
{
...
...
This diff is collapsed.
Click to expand it.
R/post_data.R
+
6
−
6
View file @
5c6cdec3
...
...
@@ -138,17 +138,17 @@ poster_data <- function(data = NULL,
## Creation de la table des definitions utiles pour le reimport dans R du jeu de donnee------------
# Creation de la table (vide) et de sa structure dans le schema de destination
if
(
!
DBI
::
dbExistsTable
(
conn
=
con
,
c
(
schema
,
"
.R
_df_def
s
"
),
table.only
=
TRUE
))
{
sql_query
<-
paste0
(
"CREATE TABLE "
,
schema
,
".\"
.R
_df_def
s
\" (table_nm character varying, df_def text[]);"
)
if
(
!
DBI
::
dbExistsTable
(
conn
=
con
,
c
(
schema
,
"
zz_r
_df_def"
),
table.only
=
TRUE
))
{
sql_query
<-
paste0
(
"CREATE TABLE "
,
schema
,
".\"
zz_r
_df_def\" (table_nm character varying, df_def text[]);"
)
DBI
::
dbExecute
(
conn
=
con
,
sql_query
)
suppressMessages
({
rpostgis
::
dbAddKey
(
conn
=
con
,
c
(
schema
,
"
.R
_df_def
s
"
),
colname
=
"table_nm"
,
rpostgis
::
dbAddKey
(
conn
=
con
,
c
(
schema
,
"
zz_r
_df_def"
),
colname
=
"table_nm"
,
type
=
"primary"
)
rpostgis
::
dbComment
(
conn
=
con
,
c
(
schema
,
"
.R
_df_def
s
"
),
rpostgis
::
dbComment
(
conn
=
con
,
c
(
schema
,
"
zz_r
_df_def"
),
comment
=
"Table holding R dataframes columns definitions (for import/export using rpostgis :: db(Read/Write)DataFrame) or {datalibaba}."
)
})
message
(
"Nouvelle table de d\u00e9finition des R dataframes R cr\u00e9\u00e9e : "
,
schema
,
".\"
.R
_df_def
s
\"."
)
schema
,
".\"
zz_r
_df_def\"."
)
}
# Peuplement de la table des definitions
## >>> normaliser le type units tant que pas géré
...
...
@@ -195,7 +195,7 @@ poster_data <- function(data = NULL,
defs2
<-
data.frame
(
table_nm
=
table
,
df_def
=
defs
)
suppressMessages
({
rpostgis
::
pgInsert
(
con
,
c
(
schema
,
"
.R
_df_def
s
"
),
defs2
,
upsert.using
=
"table_nm"
,
rpostgis
::
pgInsert
(
con
,
c
(
schema
,
"
zz_r
_df_def"
),
defs2
,
upsert.using
=
"table_nm"
,
row.names
=
FALSE
)
})
...
...
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