@@ -47,6 +47,8 @@ impl Debug for D1Core {
4747 }
4848}
4949
50+ const CLOUDFLARE_API_BASE_URL : & str = "https://api.cloudflare.com/client/v4" ;
51+
5052impl D1Core {
5153 fn create_d1_query_request (
5254 & self ,
@@ -59,11 +61,7 @@ impl D1Core {
5961 "/accounts/{}/d1/database/{}/query" ,
6062 self . account_id, self . database_id
6163 ) ;
62- let url: String = format ! (
63- "{}{}" ,
64- "https://api.cloudflare.com/client/v4" ,
65- percent_encode_path( & p)
66- ) ;
64+ let url: String = format ! ( "{}{}" , CLOUDFLARE_API_BASE_URL , percent_encode_path( & p) ) ;
6765
6866 let mut req = Request :: post ( & url) ;
6967 if let Some ( auth) = & self . authorization {
@@ -84,8 +82,13 @@ impl D1Core {
8482 }
8583
8684 pub async fn get ( & self , ctx : & OperationContext , path : & str ) -> Result < Option < Buffer > > {
85+ // d1 follows SQLite SQL syntax, we use `"` for identifier quote. A quoted identifier is case-sensitive and
86+ // can contain special characters.
87+ // Read more https://www.sqlite.org/quirks.html#double_quoted_string_literals
88+ //
89+ // We uses identifier quote for trusted table and field configuration to ensure correctness.
8790 let query = format ! (
88- "SELECT {} FROM {} WHERE {} = ? LIMIT 1" ,
91+ r# "SELECT "{}" FROM "{}" WHERE "{}" = ? LIMIT 1"# ,
8992 self . value_field, self . table, self . key_field
9093 ) ;
9194 let req =
@@ -104,15 +107,36 @@ impl D1Core {
104107 }
105108 }
106109
110+ pub async fn get_length ( & self , ctx : & OperationContext , path : & str ) -> Result < Option < usize > > {
111+ let query = format ! (
112+ r#"SELECT LENGTH(CAST("{}" AS BLOB)) AS "content_length" FROM "{}" WHERE "{}" = ? LIMIT 1"# ,
113+ self . value_field, self . table, self . key_field
114+ ) ;
115+ let req =
116+ self . create_d1_query_request ( & query, vec ! [ path. into( ) ] , Operation :: Stat , "Stat" ) ?;
117+
118+ let resp = ctx. http_transport ( ) . send ( req) . await ?;
119+ let status = resp. status ( ) ;
120+ match status {
121+ StatusCode :: OK | StatusCode :: PARTIAL_CONTENT => {
122+ let body = resp. into_body ( ) ;
123+ let bs = body. to_bytes ( ) ;
124+ let d1_response = D1Response :: parse ( & bs) ?;
125+ d1_response. get_usize_result ( "content_length" )
126+ }
127+ _ => Err ( parse_error ( resp) ) ,
128+ }
129+ }
130+
107131 pub async fn set ( & self , ctx : & OperationContext , path : & str , value : Buffer ) -> Result < ( ) > {
108132 let table = & self . table ;
109133 let key_field = & self . key_field ;
110134 let value_field = & self . value_field ;
111135 let query = format ! (
112- "INSERT INTO {table} ( {key_field}, {value_field}) \
113- VALUES (? , ?) \
114- ON CONFLICT ({key_field}) \
115- DO UPDATE SET {value_field} = EXCLUDED.{value_field}",
136+ r# "INSERT INTO " {table}" (" {key_field}", " {value_field}" ) \
137+ VALUES ('?' , ?) \
138+ ON CONFLICT (" {key_field}" ) \
139+ DO UPDATE SET " {value_field}" = EXCLUDED." {value_field}""# ,
116140 ) ;
117141
118142 let params = vec ! [ path. into( ) , value. to_vec( ) . into( ) ] ;
@@ -127,7 +151,10 @@ impl D1Core {
127151 }
128152
129153 pub async fn delete ( & self , ctx : & OperationContext , path : & str ) -> Result < ( ) > {
130- let query = format ! ( "DELETE FROM {} WHERE {} = ?" , self . table, self . key_field) ;
154+ let query = format ! (
155+ r#"DELETE FROM "{}" WHERE "{}" = ?"# ,
156+ self . table, self . key_field
157+ ) ;
131158 let req =
132159 self . create_d1_query_request ( & query, vec ! [ path. into( ) ] , Operation :: Delete , "Delete" ) ?;
133160
0 commit comments