WIP update upsert

Author: davidkhala

frame/davidkhala/data/frame/pandas/__init__.py

@@ -1,7 +1,9 @@
 import pandas as pd
 def upsert(df, *primary_keys: str, record: dict):
     index_keys = df.index.names if isinstance(df.index, pd.MultiIndex) else [df.index.name]
-    condition = True
+    condition = pd.Series(True, index=df.index)
+    if df.columns.empty and df.index.empty:
+        return pd.DataFrame([record])
 
     for key in primary_keys:
         if key in df.columns:
@@ -17,7 +19,5 @@ def upsert(df, *primary_keys: str, record: dict):
         for col, value in record.items():
             if col in df.columns:
                 df.loc[match_indices, col] = value
-    else:
-        df = pd.concat([df, pd.DataFrame([record])], ignore_index=True)
-
-    return df
+        return df
+    return pd.concat([df, pd.DataFrame([record])])

frame/tests/pandas_test.py

@@ -31,6 +31,16 @@ def test_upsert(self):
         upsert(df, prim_key, record = new_record)
 
         self.assertEqual(95, df.at[2, 'score'])
+    def test_upsert_empty(self):
+        df = pandas.DataFrame()
+        prim_key = 'id'
+        new_record = {'name': 'Charlie', 'score': 95, prim_key: 2}
+        upsert(df, prim_key, record=new_record)
+
+
+        df = pandas.DataFrame(columns=[prim_key]).set_index(prim_key)
+        upsert(df, prim_key, record=new_record)
+
     def test_upsert2(self):
         df = pandas.DataFrame([
             {'School': 'Oxford', 'Country': 'UK', 'Students': 1000},
@@ -40,6 +50,7 @@ def test_upsert2(self):
         record = {'School': 'Oxford', 'Country': 'UK', 'Students': new_students}
         df = upsert(df, 'School', 'Country', record=record)
         self.assertEqual(new_students, df.loc[('Oxford', 'UK')].Students)
+        print(df)
     def test_upsert3(self):
         df = pandas.DataFrame([
             {'School': 'Oxford', 'Country': 'UK', 'Students': 1000},