Events for simple conn

listen_event method added to simple connection type

issue #149

src/connection/simple.rs

@@ -178,7 +178,7 @@ impl SimpleConnection {
     }
 
     /// Wait for an event to be posted on database
-    pub(crate) fn wait_for_event(&mut self, name: String) -> Result<(), FbError> {
+    pub fn wait_for_event(&mut self, name: String) -> Result<(), FbError> {
         match &mut self.inner {
             #[cfg(feature = "linking")]
             TypeConnectionContainer::NativeDynLink(c) => c.wait_for_event(name),

src/events.rs

@@ -33,17 +33,32 @@ where
     fn listen_event(
         self,
         name: String,
-        mut handler: F,
+        handler: F,
     ) -> Result<JoinHandle<Result<(), FbError>>, FbError> {
-        let mut conn: SimpleConnection = self.into();
+        let conn: SimpleConnection = self.into();
+
+        return conn.listen_event(name, handler);
+    }
+}
 
+impl<F, C> RemoteEventsManager<F, C> for SimpleConnection
+where
+    C: FirebirdClient + FirebirdClientDbEvents + 'static,
+    F: FnMut(&mut SimpleConnection) -> Result<bool, FbError> + Send + Sync + 'static,
+    SimpleConnection: From<Connection<C>>,
+{
+    fn listen_event(
+        mut self,
+        name: String,
+        mut handler: F,
+    ) -> Result<JoinHandle<Result<(), FbError>>, FbError> {
         return Ok(thread::spawn(move || {
             let mut hold = true;
 
             while hold {
-                conn.wait_for_event(name.clone())?;
+                self.wait_for_event(name.clone())?;
 
-                hold = handler(&mut conn)?;
+                hold = handler(&mut self)?;
             }
 
             Ok(())
@@ -98,6 +113,38 @@ mk_tests_default! {
         Ok(())
     }
 
+    #[test]
+    #[ignore]
+    #[cfg(all(not(feature = "pure_rust"), not(feature = "embedded_tests")))]
+    fn remote_events_simple_conn() -> Result<(), FbError> {
+        let conn1: SimpleConnection = cbuilder().connect()?.into();
+        let mut conn2: SimpleConnection = cbuilder().connect()?.into();
+
+        let counter = Arc::new(Mutex::new(0)).clone();
+
+        let acounter = Arc::clone(&counter);
+        let _ = conn1.listen_event("evento2".to_string(), move |c| {
+
+            let (_,): (i32,) = c.query_first(
+                "select 1 from rdb$database",
+                (),
+            )?.unwrap();
+
+            let mut num = acounter.lock().unwrap();
+            *num += 1;
+
+            Ok(*num < 2)
+        })?;
+
+        thread::sleep(Duration::from_secs(2));
+
+        conn2.execute("execute block as begin POST_EVENT 'evento2'; end", ())?;
+        thread::sleep(Duration::from_secs(2));
+        assert_eq!(1, *counter.lock().unwrap());
+
+        Ok(())
+    }
+
     #[test]
     #[ignore]
     #[cfg(all(not(feature = "pure_rust"), not(feature = "embedded_tests")))]
@@ -109,11 +156,11 @@ mk_tests_default! {
         thread::spawn(move || {
             thread::sleep(Duration::from_secs(2));
 
-            conn1.execute("execute block as begin POST_EVENT 'evento'; end", ())
+            conn1.execute("execute block as begin POST_EVENT 'evento3'; end", ())
         });
 
         let wait = thread::spawn(move || {
-            conn2.wait_for_event("evento".to_string())
+            conn2.wait_for_event("evento3".to_string())
         });
 
         thread::sleep(Duration::from_secs(10));