Add num_idle, size

Author: owjs3901

__tests__/sql/index.test.ts

@@ -22,6 +22,8 @@ describe.sequential('sqlite', async () => {
   const pool = await createSqliteConnection({
     url: 'sqlite:./__tests__/sql/test.db',
     revisionPath: './__tests__/sql/test-index-revisions',
+    maxConnections: 5,
+    minConnections: 2,
   })
   it.each([
     ['SELECT 1 as value', { value: 1 }],
@@ -31,7 +33,7 @@ describe.sequential('sqlite', async () => {
     ['SELECT FALSE as value', { value: 0 }],
     ['SELECT 1.1 as value', { value: 1.1 }],
   ])('should select one row', async (sql, expected) => {
-    expect(await pool.fetchOne(sql)).toEqual(expected)
+    await expect(pool.fetchOne(sql)).resolves.toEqual(expected)
   })
   it.each([
     ['SELECT 1 as value', [{ value: 1 }]],
@@ -41,7 +43,7 @@ describe.sequential('sqlite', async () => {
     ['SELECT FALSE as value', [{ value: 0 }]],
     ['SELECT 1.1 as value', [{ value: 1.1 }]],
   ])('should select all', async (sql, expected) => {
-    expect(await pool.fetchAll(sql)).toEqual(expected)
+    await expect(pool.fetchAll(sql)).resolves.toEqual(expected)
   })
   it.each([
     ['SELECT NULL as value', { value: null }],
@@ -50,7 +52,7 @@ describe.sequential('sqlite', async () => {
     ['SELECT FALSE as value', { value: 0 }],
     ['SELECT 1.1 as value', { value: 1.1 }],
   ])('should select optional', async (sql, expected) => {
-    expect(await pool.fetchOptional(sql)).toEqual(expected)
+    await expect(pool.fetchOptional(sql)).resolves.toEqual(expected)
   })
   describe('model', () => {
     it('test', async () => {

sql/core/database_strategy/src/lib.rs

@@ -73,6 +73,9 @@ pub trait DatabaseStrategy: Send + Sync {
     async fn commit(&self, tx: &mut DatabaseTransaction) -> Result<(), Error>;
     async fn rollback(&self, tx: &mut DatabaseTransaction) -> Result<(), Error>;
 
+    fn num_idle(&self) -> Result<usize, Error>;
+    fn size(&self) -> Result<u32, Error>;
+
     fn get_query_params(&self) -> QueryParams;
     fn get_auto_increment_sql(&self) -> Option<String>;
     fn get_default_function_sql(&self, default: &str) -> String;

sql/core/database_strategy_mysql/src/lib.rs

@@ -190,6 +190,16 @@ impl DatabaseStrategy for MysqlDatabaseStrategy {
         }
     }
 
+    fn num_idle(&self) -> Result<usize, Error> {
+        let pool = self.pool.as_ref().ok_or(Error::PoolClosed)?;
+        Ok(pool.num_idle())
+    }
+
+    fn size(&self) -> Result<u32, Error> {
+        let pool = self.pool.as_ref().ok_or(Error::PoolClosed)?;
+        Ok(pool.size())
+    }
+
     /// check to exists devup_revisions table
     async fn has_revision(&self) -> Result<bool, Error> {
         Ok(self.fetch_one("SELECT COUNT(*) as count FROM information_schema.tables WHERE table_name = 'devup_revision'", &[], None).await?.as_u64().unwrap_or(0) > 0)

sql/core/database_strategy_postgres/src/lib.rs

@@ -189,6 +189,17 @@ impl DatabaseStrategy for PostgresDatabaseStrategy {
             _ => Err(Error::BeginFailed),
         }
     }
+
+    fn num_idle(&self) -> Result<usize, Error> {
+        let pool = self.pool.as_ref().ok_or(Error::PoolClosed)?;
+        Ok(pool.num_idle())
+    }
+
+    fn size(&self) -> Result<u32, Error> {
+        let pool = self.pool.as_ref().ok_or(Error::PoolClosed)?;
+        Ok(pool.size())
+    }
+
     /// check to exists devup_revisions table
     async fn has_revision(&self) -> Result<bool, Error> {
         Ok(self.fetch_one("SELECT COUNT(*) as count FROM information_schema.tables WHERE table_name = 'devup_revision'", &[],None).await?.as_u64().unwrap_or(0) > 0)

sql/core/database_strategy_sqlite/src/lib.rs

@@ -205,8 +205,18 @@ impl DatabaseStrategy for SqliteDatabaseStrategy {
             _ => Err(Error::BeginFailed),
         }
     }
+
+    fn num_idle(&self) -> Result<usize, Error> {
+        let pool = self.pool.as_ref().ok_or(Error::PoolClosed)?;
+        Ok(pool.num_idle())
+    }
+
+    fn size(&self) -> Result<u32, Error> {
+        let pool = self.pool.as_ref().ok_or(Error::PoolClosed)?;
+        Ok(pool.size())
+    }
+
     /// check to exists devup_revisions table
-    ///
     async fn has_revision(&self) -> Result<bool, Error> {
         Ok(self.fetch_one("SELECT COUNT(*) as count FROM sqlite_master WHERE type = 'table' AND name = 'devup_revision'", &[],None).await?.as_u64().unwrap_or(0) > 0)
     }

sql/core/devup_database/src/lib.rs

@@ -277,6 +277,14 @@ impl DevupSqlPool {
         Ok(())
     }
 
+    pub fn num_idle(&self) -> Result<usize, Error> {
+        self.options.database_strategy.num_idle()
+    }
+
+    pub fn size(&self) -> Result<u32, Error> {
+        self.options.database_strategy.size()
+    }
+
     pub async fn save(
         &self,
         obj: &Value,

sql/libs/node/pool/src/lib.rs

@@ -237,6 +237,19 @@ impl DevupNodeSqlPool {
             .map_err(to_napi_error)
     }
 
+    #[napi]
+    pub fn num_idle(&self) -> napi::Result<i32> {
+        self.inner
+            .num_idle()
+            .map(|v| v as i32)
+            .map_err(to_napi_error)
+    }
+
+    #[napi]
+    pub fn size(&self) -> napi::Result<u32> {
+        self.inner.size().map_err(to_napi_error)
+    }
+
     #[napi]
     pub async fn save(
         &self,

sql/libs/node/sqlite/index.d.ts

@@ -81,6 +81,8 @@ export declare class DevupNodeSqlPool {
   setupRevision(): Promise<void>
   commit(tx: DevupNodeSqlTransaction): Promise<void>
   rollback(tx: DevupNodeSqlTransaction): Promise<void>
+  numIdle(): number
+  size(): number
   save(obj: any, tx?: DevupNodeSqlTransaction | undefined | null): Promise<any>
   delete(obj: any, tx?: DevupNodeSqlTransaction | undefined | null): Promise<void>
   find(modelName: string, tx?: DevupNodeSqlTransaction | undefined | null): Promise<Array<any>>