Skip to content

Commit fa66fe6

Browse files
committed
clean up db interface a bit
1 parent 9901d3e commit fa66fe6

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

R/db_ops.R

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ rq_table_exists <- function(db, table_name,
103103
}
104104
connection_options <- db$connection_options
105105
connection <- db$connection
106-
q_table_name <- db$quote_table_name(db, table_name, qualifiers = qualifiers)
106+
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
107107
} else {
108108
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
109109
}
@@ -173,7 +173,7 @@ rq_colnames <- function(db, table_name,
173173
}
174174
connection_options <- db$connection_options
175175
connection <- db$connection
176-
q_table_name <- db$quote_table_name(db, table_name, qualifiers = qualifiers)
176+
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
177177
} else {
178178
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
179179
}
@@ -270,7 +270,7 @@ rq_coltypes <- function(db, table_name,
270270
}
271271
connection_options <- db$connection_options
272272
connection <- db$connection
273-
q_table_name <- db$quote_table_name(db, table_name, qualifiers = qualifiers)
273+
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
274274
} else {
275275
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
276276
}
@@ -332,7 +332,7 @@ rq_remove_table <- function(db, table_name,
332332
}
333333
connection_options <- db$connection_options
334334
connection <- db$connection
335-
q_table_name <- db$quote_table_name(db, table_name, qualifiers = qualifiers)
335+
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
336336
} else {
337337
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
338338
}
@@ -532,7 +532,7 @@ rq_nrow <- function(db, table_name,
532532
if(!is.null(f)) {
533533
return(f(db, table_name, qualifiers = qualifiers))
534534
}
535-
q_table_name <- db$quote_table_name(db, table_name, qualifiers = qualifiers)
535+
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
536536
} else {
537537
q_table_name <- quote_table_name(db, table_name, qualifiers = qualifiers)
538538
}

extras/check_reverse_dependencies.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ package = "rquery"
88
date()
99
```
1010

11-
## [1] "Tue Jan 7 07:57:17 2020"
11+
## [1] "Thu Jan 16 15:37:30 2020"
1212

1313
``` r
1414
packageVersion(package)
1515
```
1616

17-
## [1] '1.4.1'
17+
## [1] '1.4.2'
1818

1919
``` r
2020
parallelCluster <- NULL
@@ -34,7 +34,7 @@ setwd(td)
3434
print(td)
3535
```
3636

37-
## [1] "/var/folders/7q/h_jp2vj131g5799gfnpzhdp80000gn/T//RtmpG70agh"
37+
## [1] "/var/folders/7q/h_jp2vj131g5799gfnpzhdp80000gn/T//RtmpEmcqsX"
3838

3939
``` r
4040
options(repos = c(CRAN="https://cloud.r-project.org"))
@@ -59,9 +59,9 @@ if(!is.null(parallelCluster)) {
5959
}
6060
```
6161

62-
## cdata_1.1.3 started at 2020-01-07 07:57:20 success at 2020-01-07 07:57:55 (1/0/0)
63-
## rqdatatable_1.2.4 started at 2020-01-07 07:57:55 success at 2020-01-07 07:58:29 (2/0/0)
64-
## WVPlots_1.2.2 started at 2020-01-07 07:58:29 success at 2020-01-07 08:00:02 (3/0/0)
62+
## cdata_1.1.4 started at 2020-01-16 15:37:33 success at 2020-01-16 15:38:04 (1/0/0)
63+
## rqdatatable_1.2.5 started at 2020-01-16 15:38:04 success at 2020-01-16 15:38:28 (2/0/0)
64+
## WVPlots_1.2.2 started at 2020-01-16 15:38:28 success at 2020-01-16 15:39:41 (3/0/0)
6565

6666
## [1] id title status
6767
## <0 rows> (or 0-length row.names)
@@ -71,8 +71,8 @@ summariseQueue(package=package, directory=td)
7171
```
7272

7373
## Test of rquery had 3 successes, 0 failures, and 0 skipped packages.
74-
## Ran from 2020-01-07 07:57:20 to 2020-01-07 08:00:02 for 2.7 mins
75-
## Average of 54 secs relative to 53.939 secs using 1 runners
74+
## Ran from 2020-01-16 15:37:33 to 2020-01-16 15:39:41 for 2.133 mins
75+
## Average of 42.667 secs relative to 42.486 secs using 1 runners
7676
##
7777
## Failed packages:
7878
##

0 commit comments

Comments
 (0)