@@ -33,9 +33,10 @@ const buildTimeQuery = (before, after) => {
33
33
return [ true ] ;
34
34
} ;
35
35
36
- const queryDomain = ( domain , reportName , limitParam , pageParam , before , after ) => {
36
+ const queryDomain = ( domain , reportName , limitParam , pageParam , before , after , dbTable ) => {
37
37
const timeQuery = buildTimeQuery ( before , after ) ;
38
- return db ( 'analytics_data' )
38
+
39
+ return db ( dbTable )
39
40
. where ( { report_name : reportName } )
40
41
. whereRaw ( 'data->> \'domain\' = ?' , [ domain ] )
41
42
. whereRaw ( ...timeQuery )
@@ -64,17 +65,20 @@ const query = ({ reportName,
64
65
page = 1 ,
65
66
domain = null ,
66
67
after = null ,
67
- before = null
68
+ before = null ,
69
+ version
68
70
} ) => {
71
+ // we have different tables for new ga4
72
+ const dbTable = version === '1.1' ? "analytics_data" : "analytics_data_ga4"
69
73
const limitParam = parseLimitParam ( limit ) ;
70
74
const pageParam = parsePageParam ( page ) ;
71
75
if ( domain && reportName !== 'download' ) {
72
- return queryDomain ( domain , reportName , limitParam , pageParam , before , after ) ;
76
+ return queryDomain ( domain , reportName , limitParam , pageParam , before , after , version ) ;
73
77
}
74
78
const recordQuery = Object . assign ( { report_name : reportName , report_agency : reportAgency } ) ;
75
79
const timeQuery = buildTimeQuery ( before , after ) ;
76
80
77
- return db ( 'analytics_data' )
81
+ return db ( dbTable )
78
82
. where ( recordQuery )
79
83
. whereRaw ( ...timeQuery )
80
84
// Using `orderByRaw` in order to specifcy NULLS LAST, see:
0 commit comments