echoss-db 1.2.0__tar.gz → 1.2.2__tar.gz

{echoss_db-1.2.0 → echoss_db-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echoss-db
-Version: 1.2.0
+Version: 1.2.2
 Summary: echoss AI Bigdata Solution - Database Query Package
 Home-page: https://github.com/12cmlab/echoss-query
 Author: ckkim

{echoss_db-1.2.0 → echoss_db-1.2.2}/echoss_db/mysql_query.py

@@ -50,7 +50,7 @@ def parse_query(keyword):
         def wrapper(self, query_str: str, params=None, *args, **kwargs):
             # Check if the query contains the specified keyword
             if keyword not in query_str.upper():
-                raise ValueError(f'Input query does not include "{keyword}"')
+                raise ValueError(f"Input query does not include '{keyword}'")
 
             # 불필요한 세미콜론 제거 (trailing only) 끝의 세미콜론/공백만 안전하게 제거 (SQLAlchemy는 ; 불필요)
             # 예: "SELECT ... ;   " -> "SELECT ..."
@@ -335,7 +335,7 @@ class MysqlQuery:
                 rs = self._execute_query(conn, query_str, params)
                 row = self._fetch_one(rs)
                 if row:
-                    return row
+                    return row._asdict()
                 else:
                     logger.debug("[MySQL] No data found")
                     return {}
@@ -356,13 +356,14 @@ class MysqlQuery:
             with self.engine.connect() as conn:
                 rs = self._execute_query(conn, query_str, params)
                 rows = self._fetch_all(rs)
-                if rows is None:
+                if not rows:
                     logger.debug("[MySQL] data not exist")
-                    result_list = None
+                    result_list = []
                 elif isinstance(rows, list):
-                    result_list = rows
+                    result_list = [row._asdict() for row in rows]
                 else:
-                    result_list = [rows]
+                    result_one = rows._asdict() if hasattr(rows, "_asdict") else rows
+                    result_list = [result_one]
                 return result_list
         except SQLAlchemyError  as e:
             logger.debug(f"[MySQL] SELECT_LIST Exception : {e}")
@@ -470,11 +471,12 @@ class MysqlQuery:
     # ----------------------------------------------------------------------------------
     
     @parse_query('INSERT')
-    def insert(self, query_str: str, params=None) -> int:
+    def insert(self, query_str: str, params=None, return_lastrowid=False) -> int:
         """
         Args:
             query_str(str) : MySQL insert query string
             params : query string format parameters like % style, tuple or  list of tuple
+            return_lastrowid (bool) : return rowcount if False, else return lastwrowid
         Returns:
             pd.DataFrame() : DataFrame of query result
         """
@@ -484,9 +486,15 @@ class MysqlQuery:
                     rs = self._execute_query(conn, query_str, params)
                 else:
                     rs = self._execute_query(conn, query_str, params)
-                rowcount = rs.rowcount if rs.rowcount is not None else 0
-                logger.debug(f"[MySQL] INSERT {rowcount} rows")
-                return rowcount
+
+                if return_lastrowid:
+                    lastrowid = rs.lastrowid if rs.lastrowid is not None else 0
+                    logger.debug(f"[MySQL] INSERT last row id at {lastrowid}")
+                    return lastrowid
+                else:
+                    rowcount = rs.rowcount if rs.rowcount is not None else 0
+                    logger.debug(f"[MySQL] INSERT {rowcount} rows")
+                    return rowcount
         except SQLAlchemyError  as e:
             logger.error(f"[MySQL] INSERT Exception : {e}")
             return 0

{echoss_db-1.2.0 → echoss_db-1.2.2}/echoss_db.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echoss-db
-Version: 1.2.0
+Version: 1.2.2
 Summary: echoss AI Bigdata Solution - Database Query Package
 Home-page: https://github.com/12cmlab/echoss-query
 Author: ckkim

{echoss_db-1.2.0 → echoss_db-1.2.2}/setup.py

@@ -7,7 +7,7 @@ package_name = "echoss-db"
 
 setup(
     name='echoss-db',
-    version='1.2.0',
+    version='1.2.2',
     author='ckkim',
     author_email='ckkim@12cm.co.kr',
     url='https://github.com/12cmlab/echoss-query',