44
55import requests
66
7- from ravendb import RavenCommand , RaftCommand , ConnectionString , ServerNode
7+ from ravendb import RavenCommand , RaftCommand , ServerNode
88from ravendb .documents .operations .definitions import MaintenanceOperation
99from ravendb .util .util import RaftIdGenerator
10+ from ravendb .serverwide .server_operation_executor import ConnectionStringType
1011
1112
1213class RemoveConnectionStringResult :
@@ -17,27 +18,29 @@ def to_json(self) -> Dict:
1718 return {"RaftCommandIndex" : self .raft_command_index }
1819
1920 @classmethod
20- def from_json (cls , json_dict : Dict ) -> "PutConnectionStringResult " :
21+ def from_json (cls , json_dict : Dict ) -> "RemoveConnectionStringResult " :
2122 return cls (json_dict ["RaftCommandIndex" ])
2223
2324
2425class RemoveConnectionStringOperation (MaintenanceOperation [RemoveConnectionStringResult ]):
25- def __init__ (self , connection_string : ConnectionString = None ):
26- self ._connection_string = connection_string
26+ def __init__ (self , connection_string_name : str , connection_string_type : ConnectionStringType ):
27+ self ._connection_string_name = connection_string_name
28+ self ._connection_string_type = connection_string_type
2729
28- def get_command (self , conventions : "DocumentConventions" ) -> "RavenCommand[_T ]" :
29- return self .RemoveConnectionStringCommand (self ._connection_string )
30+ def get_command (self , conventions : "DocumentConventions" ) -> "RavenCommand[RemoveConnectionStringResult ]" :
31+ return self .RemoveConnectionStringCommand (self ._connection_string_name , self . _connection_string_type )
3032
3133 class RemoveConnectionStringCommand (RavenCommand [RemoveConnectionStringResult ], RaftCommand ):
32- def __init__ (self , connection_string : ConnectionString = None ):
34+ def __init__ (self , connection_string_name : str , connection_string_type : ConnectionStringType ):
3335 super ().__init__ (RemoveConnectionStringResult )
34- self ._connection_string = connection_string
36+ self ._connection_string_name = connection_string_name
37+ self ._connection_string_type = connection_string_type
3538
3639 def is_read_request (self ) -> bool :
3740 return False
3841
3942 def create_request (self , node : ServerNode ) -> requests .Request :
40- url = f"{ node .url } /databases/{ node .database } /admin/connection-strings?connectionString={ urllib .parse .quote (self ._connection_string . name )} &type={ self ._connection_string . get_type } "
43+ url = f"{ node .url } /databases/{ node .database } /admin/connection-strings?connectionString={ urllib .parse .quote (self ._connection_string_name )} &type={ self ._connection_string_type . value } "
4144
4245 request = requests .Request ("DELETE" )
4346 request .url = url
0 commit comments