meerschaum 2.9.2__tar.gz → 2.9.3__tar.gz

{meerschaum-2.9.2/meerschaum.egg-info → meerschaum-2.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 2.9.2
+Version: 2.9.3
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.9.2 → meerschaum-2.9.3}/meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.9.2"
+__version__ = "2.9.3"

{meerschaum-2.9.2 → meerschaum-2.9.3}/meerschaum/utils/daemon/Daemon.py

@@ -1089,32 +1089,59 @@ class Daemon:
         """Write the properties dictionary to the properties JSON file
         (only if self.properties exists).
         """
+        from meerschaum.utils.misc import generate_password
         success, msg = (
             False,
             f"No properties to write for daemon '{self.daemon_id}'."
         )
-        if self.properties is not None:
+        backup_path = self.properties_path.parent / (generate_password(8) + '.json')
+        props = self.properties
+        if props is not None:
             try:
                 self.path.mkdir(parents=True, exist_ok=True)
+                if self.properties_path.exists():
+                    self.properties_path.rename(backup_path)
                 with open(self.properties_path, 'w+', encoding='utf-8') as properties_file:
-                    json.dump(self.properties, properties_file)
+                    json.dump(props, properties_file)
                 success, msg = True, 'Success'
             except Exception as e:
                 success, msg = False, str(e)
+
+        try:
+            if backup_path.exists():
+                if not success:
+                    backup_path.rename(self.properties_path)
+                else:
+                    backup_path.unlink()
+        except Exception as e:
+            success, msg = False, str(e)
+
         return success, msg
 
     def write_pickle(self) -> SuccessTuple:
         """Write the pickle file for the daemon."""
         import pickle
         import traceback
+        from meerschaum.utils.misc import generate_password
+        backup_path = self.pickle_path.parent / (generate_password(7) + '.pkl')
         try:
             self.path.mkdir(parents=True, exist_ok=True)
+            if self.pickle_path.exists():
+                self.pickle_path.rename(backup_path)
             with open(self.pickle_path, 'wb+') as pickle_file:
                 pickle.dump(self, pickle_file)
             success, msg = True, "Success"
         except Exception as e:
             success, msg = False, str(e)
             traceback.print_exception(type(e), e, e.__traceback__)
+        try:
+            if backup_path.exists():
+                if not success:
+                    backup_path.rename(self.pickle_path)
+                else:
+                    backup_path.unlink()
+        except Exception as e:
+            success, msg = False, str(e)
         return success, msg
 
 

{meerschaum-2.9.2 → meerschaum-2.9.3}/meerschaum/utils/sql.py

@@ -460,11 +460,11 @@ columns_indices_queries = {
 }
 reset_autoincrement_queries: Dict[str, Union[str, List[str]]] = {
     'default': """
-        SELECT SETVAL(pg_get_serial_sequence('{table}', '{column}'), {val})
+        SELECT SETVAL(pg_get_serial_sequence('{table_name}', '{column}'), {val})
         FROM {table_name}
     """,
     'mssql': """
-        DBCC CHECKIDENT ('{table}', RESEED, {val})
+        DBCC CHECKIDENT ('{table_name}', RESEED, {val})
     """,
     'mysql': """
         ALTER TABLE {table_name} AUTO_INCREMENT = {val}

{meerschaum-2.9.2 → meerschaum-2.9.3/meerschaum.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meerschaum
-Version: 2.9.2
+Version: 2.9.3
 Summary: Sync Time-Series Pipes with Meerschaum
 Home-page: https://meerschaum.io
 Author: Bennett Meares

{meerschaum-2.9.2 → meerschaum-2.9.3}/tests/test_sync.py

@@ -503,7 +503,7 @@ def test_sync_inplace_upsert(flavor: str):
         'test', 'inplace', 'upsert',
         instance=conn,
         columns={'datetime': 'dt', 'id': 'id'},
-        indices={'all': ['dt', 'id', 'geom'], 'geom': 'geom'},
+        indices={'all': ['dt', 'id']},
         upsert=True,
     )
     dest_pipe = Pipe(str(conn), 'inplace', 'upsert', instance=conn)
@@ -916,16 +916,18 @@ def test_autoincrement_primary_key(flavor: str):
         return
     pipe = mrsm.Pipe('test_sync', 'primary_key', 'autoincrement', instance=conn)
     pipe.delete()
+    id_col = 'My ID'
     pipe = mrsm.Pipe(
         'test_sync', 'primary_key', 'autoincrement',
         instance=conn,
+        target="Test Sync Primary Key Autoincrement",
         columns={
-            'primary': 'id',
+            'primary': id_col,
         },
         parameters={
             'autoincrement': True,
         },
-        dtypes={'id': 'int'},
+        dtypes={id_col: 'int'},
     )
     success, msg = pipe.sync([
         {'color': 'red'},
@@ -933,19 +935,19 @@ def test_autoincrement_primary_key(flavor: str):
     ], debug=debug)
     assert success
 
-    df = pipe.get_data(['id'])
-    assert list(df['id']) == [1, 2]
+    df = pipe.get_data([id_col])
+    assert list(df[id_col]) == [1, 2]
 
-    success, msg = pipe.sync([{'id': 1, 'color': 'green'}], debug=debug)
+    success, msg = pipe.sync([{id_col: 1, 'color': 'green'}], debug=debug)
     assert success, msg
 
-    df = pipe.get_data(params={'id': 1})
+    df = pipe.get_data(params={id_col: 1})
     assert df['color'][0] == 'green'
 
-    success, msg = pipe.sync([{'id': 4, 'shirt_size': 'L'}, {'id': 5, 'shirt_size': 'M'}], debug=debug)
+    success, msg = pipe.sync([{id_col: 4, 'shirt_size': 'L'}, {id_col: 5, 'shirt_size': 'M'}], debug=debug)
     assert success
 
-    df = pipe.get_data(['shirt_size'], params={'id': [4, 5]}, debug=debug)
+    df = pipe.get_data(['shirt_size'], params={id_col: [4, 5]}, debug=debug)
     assert list(df['shirt_size']) == ['L', 'M']
 
     success, msg = pipe.sync([{'color': 'purple'}, {'shirt_size': 'S'}], debug=debug)
@@ -953,7 +955,7 @@ def test_autoincrement_primary_key(flavor: str):
 
     df = pipe.get_data()
     print(df)
-    df = pipe.get_data(['shirt_size'], params={'id': 7}, debug=debug)
+    df = pipe.get_data(['shirt_size'], params={id_col: 7}, debug=debug)
     assert df['shirt_size'][0] == 'S'
 
     assert pipe.get_rowcount(debug=debug) == 6