fixes int being returned as numpt.int64

Author: ssweber

pysimplesql/pysimplesql.py

@@ -6300,11 +6300,11 @@ def relationship_to_join_clause(self, r_obj: Relationship):
 
     def min_pk(self, table: str, pk_column: str) -> int:
         rows = self.execute(f"SELECT MIN({pk_column}) as min_pk FROM {table}")
-        return rows.iloc[0]["min_pk"]
+        return rows.iloc[0]["min_pk"].tolist()
 
     def max_pk(self, table: str, pk_column: str) -> int:
         rows = self.execute(f"SELECT MAX({pk_column}) as max_pk FROM {table}")
-        return rows.iloc[0]["max_pk"]
+        return rows.iloc[0]["max_pk"].tolist()
 
     def generate_join_clause(self, dataset: DataSet) -> str:
         """
@@ -7083,9 +7083,7 @@ def column_info(self, table):
     def pk_column(self, table):
         query = "SHOW KEYS FROM {} WHERE Key_name = 'PRIMARY'".format(table)
         rows = self.execute(query, silent=True)
-        for _, row in rows.iterrows():
-            return row["Column_name"]
-        return None
+        return rows.iloc[0]["Column_name"]
 
     def relationships(self):
         # Return a list of dicts {from_table,to_table,from_column,to_column,requery}
@@ -7341,9 +7339,7 @@ def pk_column(self, table):
             f"tc.table_name = '{table}' "
         )
         rows = self.execute(query, silent=True)
-        for _, row in rows.iterrows():
-            return row["column_name"]
-        return None
+        return rows.iloc[0]["column_name"]
 
     def relationships(self):
         # Return a list of dicts {from_table,to_table,from_column,to_column,requery}
@@ -7389,15 +7385,15 @@ def min_pk(self, table: str, pk_column: str) -> int:
         rows = self.execute(
             f"SELECT COALESCE(MIN({pk_column}), 0) AS min_pk FROM {table};", silent=True
         )
-        return rows.fetchone()["min_pk"]
+        return rows.iloc[0]["min_pk"].tolist()
 
     def max_pk(self, table: str, pk_column: str) -> int:
         table = self.quote_table(table)
         pk_column = self.quote_column(pk_column)
         rows = self.execute(
             f"SELECT COALESCE(MAX({pk_column}), 0) AS max_pk FROM {table};", silent=True
         )
-        return rows.fetchone()["max_pk"]
+        return rows.iloc[0]["max_pk"].tolist()
 
     def next_pk(self, table: str, pk_column: str) -> int:
         # Working with case-sensitive tables is painful in Postgres.  First, the
@@ -7410,9 +7406,7 @@ def next_pk(self, table: str, pk_column: str) -> int:
         # wrap the quoted string in singe quotes.  Phew!
         q = f"SELECT nextval('{seq}') LIMIT 1;"
         rows = self.execute(q, silent=True)
-        for _, row in rows.iterrows():
-            return row["nextval"]
-        return None
+        return rows.iloc[0]["nextval"].tolist()
 
     def insert_record(self, table: str, pk: int, pk_column: str, row: dict):
         # insert_record() for Postgres is a little different from the rest. Instead of
@@ -7546,7 +7540,7 @@ def get_tables(self):
             "SELECT table_name FROM information_schema.tables WHERE table_catalog = ?"
         )
         rows = self.execute(query, [self.database], silent=True)
-        return [row["table_name"] for row in rows]
+        return list(rows["table_name"])
 
     def column_info(self, table):
         # Return a list of column names
@@ -7562,10 +7556,10 @@ def column_info(self, table):
             WHERE TABLE_NAME = ?
         """
         pk_rows = self.execute(pk_query, [table], silent=True)
-        for pk_row in pk_rows:
+        for _, pk_row in pk_rows.iterrows():
             pk_columns.append(pk_row["COLUMN_NAME"])
 
-        for row in rows:
+        for _, row in rows.iterrows():
             name = row["COLUMN_NAME"]
             domain = row["DATA_TYPE"].upper()
             notnull = row["IS_NULLABLE"] == "NO"
@@ -7602,7 +7596,7 @@ def relationships(self):
 
             rows = self.execute(query, silent=True)
 
-            for row in rows:
+            for _, row in rows.iterrows():
                 dic = {}
                 dic["from_table"] = row["from_table"]
                 dic["to_table"] = row["to_table"]
@@ -7626,8 +7620,8 @@ def pk_column(self, table):
 
         rows = self.execute(query, silent=True)
 
-        if rows:
-            return rows[0]["COLUMN_NAME"]
+        if not rows.empty:
+            return rows.iloc[0]["COLUMN_NAME"]
         return None