Skip to content

Commit cf6659e

Browse files
committed
in work
1 parent d5de132 commit cf6659e

File tree

15 files changed

+19
-866
lines changed

15 files changed

+19
-866
lines changed

packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2556,7 +2556,7 @@ SELECT 1 AS revenue, cast('2024-01-01' AS timestamp) as time UNION ALL
25562556
});
25572557
});
25582558

2559-
it('subquery 1', async () => {
2559+
it('subquery', async () => {
25602560
await compiler.compile();
25612561

25622562
const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {

rust/cubenativeutils/src/wrappers/context.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ use std::any::Any;
22

33
use super::FunctionArgsDef;
44
use super::{inner_types::InnerTypes, object_handle::NativeObjectHandle};
5-
use crate::wrappers::serializer::{NativeDeserialize, NativeSerialize};
6-
use crate::wrappers::*;
5+
use crate::wrappers::serializer::NativeSerialize;
76
use crate::CubeError;
87

98
pub trait NativeContext<IT: InnerTypes>: Clone {

rust/cubenativeutils/src/wrappers/neon/context.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,17 @@ use super::{
1010
};
1111
use crate::wrappers::neon::object::IntoNeonObject;
1212
use crate::wrappers::object::*;
13-
use crate::wrappers::serializer::{NativeDeserialize, NativeSerialize};
13+
use crate::wrappers::serializer::NativeSerialize;
1414
use crate::wrappers::{
1515
context::NativeContext, functions_args_def::FunctionArgsDef, object::NativeObject,
1616
object_handle::NativeObjectHandle, NativeContextHolder,
1717
};
18-
use crate::wrappers::{NativeString, NativeStruct};
1918
use crate::CubeError;
2019
use neon::prelude::*;
2120
use std::{
2221
cell::RefCell,
2322
rc::{Rc, Weak},
2423
};
25-
use tokio::sync::mpsc::error::SendTimeoutError;
2624

2725
pub struct ContextHolder<C: Context<'static>> {
2826
context: Weak<RefCell<ContextWrapper<C>>>,

rust/cubenativeutils/src/wrappers/neon/lifetime_guard.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ use super::object::NeonObject;
22
use super::*;
33
use crate::CubeError;
44
use crate::{
5-
wrappers::{
6-
functions_args_def::FunctionArgsDef, object_handle::NativeObjectHandle, NativeContextHolder,
7-
},
5+
wrappers::{functions_args_def::FunctionArgsDef, object_handle::NativeObjectHandle},
86
CubeErrorCauseType,
97
};
108
use neon::prelude::*;

rust/cubenativeutils/src/wrappers/object_handle.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use super::{inner_types::InnerTypes, object::NativeObject};
22
use super::{NativeContextHolder, NativeContextHolderRef, NativeString, NativeStruct};
3-
use crate::wrappers::NativeNumber;
43
use crate::CubeError;
54

65
#[derive(Clone)]

rust/cubenativeutils/src/wrappers/proxy.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
use std::any::Any;
2-
3-
use super::FunctionArgsDef;
41
use super::{inner_types::InnerTypes, object_handle::NativeObjectHandle};
5-
use crate::wrappers::serializer::{NativeDeserialize, NativeSerialize};
2+
use crate::wrappers::serializer::NativeSerialize;
63
use crate::wrappers::*;
74
use crate::CubeError;
85
pub fn make_proxy<

rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/filter_params_callback.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
use cubenativeutils::wrappers::serializer::{
2-
NativeDeserialize, NativeDeserializer, NativeSerialize,
3-
};
4-
use cubenativeutils::wrappers::{inner_types::InnerTypes, NativeString};
1+
use cubenativeutils::wrappers::inner_types::InnerTypes;
2+
use cubenativeutils::wrappers::serializer::{NativeDeserialize, NativeSerialize};
53
use cubenativeutils::wrappers::{NativeContextHolder, NativeFunction};
64
use cubenativeutils::wrappers::{NativeContextHolderRef, NativeObjectHandle};
75
use cubenativeutils::CubeError;

rust/cubesqlplanner/cubesqlplanner/src/cube_bridge/member_sql.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
use super::filter_params_callback::{FilterParamsCallback, NativeFilterParamsCallback};
22
use super::{
3-
filter_group::{FilterGroup, NativeFilterGroup},
4-
filter_params::{FilterParams, NativeFilterParams},
53
security_context::{NativeSecurityContext, SecurityContext},
6-
sql_utils::{NativeSqlUtils, SqlUtils},
4+
sql_utils::NativeSqlUtils,
75
};
86
use crate::utils::UniqueVector;
97
use crate::{cube_bridge::base_tools::BaseTools, planner::sql_evaluator::SqlCallArg};
108
use cubenativeutils::wrappers::object::{NativeFunction, NativeStruct, NativeType};
11-
use cubenativeutils::wrappers::serializer::{
12-
NativeDeserialize, NativeDeserializer, NativeSerialize,
13-
};
9+
use cubenativeutils::wrappers::serializer::{NativeDeserialize, NativeSerialize};
10+
use cubenativeutils::wrappers::NativeContextHolderRef;
1411
use cubenativeutils::wrappers::NativeObjectHandle;
1512
use cubenativeutils::wrappers::{inner_types::InnerTypes, NativeString};
16-
use cubenativeutils::wrappers::{make_proxy, NativeContextHolderRef};
1713
use cubenativeutils::wrappers::{NativeArray, NativeContextHolder};
1814
use cubenativeutils::CubeError;
19-
use serde::{Deserialize, Serialize};
20-
use std::collections::hash_map::HashMap;
2115
use std::rc::Rc;
2216
use std::{any::Any, cell::RefCell, rc::Weak};
2317

rust/cubesqlplanner/cubesqlplanner/src/planner/query_tools.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ impl QueryToolsCachedData {
108108
pub struct QueryTools {
109109
cube_evaluator: Rc<dyn CubeEvaluator>,
110110
base_tools: Rc<dyn BaseTools>,
111-
security_context: Rc<dyn SecurityContext>,
112111
join_graph: Rc<dyn JoinGraph>,
113112
templates_render: Rc<dyn SqlTemplatesRender>,
114113
params_allocator: Rc<RefCell<ParamsAllocator>>,
@@ -142,7 +141,6 @@ impl QueryTools {
142141
)));
143142
Ok(Rc::new(Self {
144143
cube_evaluator,
145-
security_context,
146144
base_tools,
147145
join_graph,
148146
templates_render,

0 commit comments

Comments
 (0)