Revert "Refactor sql methods in PySessionContext to use immutable self reference"

This reverts commit d5820e1.

Author: kosiew

src/context.rs

@@ -429,15 +429,15 @@ impl PySessionContext {
     }
 
     /// Returns a PyDataFrame whose plan corresponds to the SQL statement.
-    pub fn sql(&self, query: &str, py: Python) -> PyDataFusionResult<PyDataFrame> {
+    pub fn sql(&mut self, query: &str, py: Python) -> PyDataFusionResult<PyDataFrame> {
         let result = self.ctx.sql(query);
         let df = wait_for_future(py, result)??;
         Ok(PyDataFrame::new(df))
     }
 
     #[pyo3(signature = (query, options=None))]
     pub fn sql_with_options(
-        &self,
+        &mut self,
         query: &str,
         options: Option<PySQLOptions>,
         py: Python,

src/utils.rs

@@ -82,7 +82,7 @@ where
     const INTERVAL_CHECK_SIGNALS: Duration = Duration::from_millis(1_000);
 
     py.allow_threads(|| {
-        let wait_future = || async {
+        runtime.block_on(async {
             tokio::pin!(fut);
             loop {
                 tokio::select! {
@@ -92,13 +92,7 @@ where
                     }
                 }
             }
-        };
-
-        if tokio::runtime::Handle::try_current().is_ok() {
-            tokio::task::block_in_place(|| runtime.block_on(wait_future()))
-        } else {
-            runtime.block_on(wait_future())
-        }
+        })
     })
 }