meerschaum 2.6.2__py3-none-any.whl → 2.6.4__py3-none-any.whl

meerschaum/config/_version.py

@@ -2,4 +2,4 @@
 Specify the Meerschaum release version.
 """
 
-__version__ = "2.6.2"
+__version__ = "2.6.4"

meerschaum/connectors/sql/_pipes.py

@@ -877,10 +877,21 @@ def get_pipe_data(
         attempt_cast_to_uuid,
         are_dtypes_equal,
     )
+    from meerschaum.utils.dtypes.sql import get_pd_type_from_db_type
     pd = import_pandas()
     is_dask = 'dask' in pd.__name__
 
-    dtypes = pipe.dtypes
+    cols_types = pipe.get_columns_types(debug=debug)
+    dtypes = {
+        **{
+            p_col: to_pandas_dtype(p_typ)
+            for p_col, p_typ in pipe.dtypes.items()
+        },
+        **{
+            col: get_pd_type_from_db_type(typ)
+            for col, typ in cols_types.items()
+        }
+    }
     if dtypes:
         if self.flavor == 'sqlite':
             if not pipe.columns.get('datetime', None):
@@ -1078,7 +1089,12 @@ def get_pipe_data_query(
     """
     from meerschaum.utils.misc import items_str
     from meerschaum.utils.sql import sql_item_name, dateadd_str
+    from meerschaum.utils.dtypes import coerce_timezone
+    from meerschaum.utils.dtypes.sql import get_pd_type_from_db_type
+
+    dt_col = pipe.columns.get('datetime', None)
     existing_cols = pipe.get_columns_types(debug=debug)
+    dt_typ = get_pd_type_from_db_type(existing_cols[dt_col]) if dt_col in existing_cols else None
     select_columns = (
         [col for col in existing_cols]
         if not select_columns
@@ -1097,6 +1113,10 @@ def get_pipe_data_query(
             begin -= backtrack_interval
 
     begin, end = pipe.parse_date_bounds(begin, end)
+    if isinstance(begin, datetime) and dt_typ:
+        begin = coerce_timezone(begin, strip_utc=('utc' not in dt_typ.lower()))
+    if isinstance(end, datetime) and dt_typ:
+        end = coerce_timezone(end, strip_utc=('utc' not in dt_typ.lower()))
 
     cols_names = [
         sql_item_name(col, self.flavor, None)

meerschaum/connectors/sql/_sql.py

@@ -641,7 +641,7 @@ def exec_queries(
         will be considered a callable hook that returns a list of queries to be executed
         before the next item in the list.
 
-    break_on_error: bool, default True
+    break_on_error: bool, default False
         If `True`, stop executing when a query fails.
 
     rollback: bool, default True

meerschaum/connectors/valkey/_pipes.py

@@ -416,7 +416,7 @@ def get_pipe_data(
     table_name = self.quote_table(pipe.target)
     indices = [col for col in pipe.columns.values() if col]
     ix_docs = [
-        string_to_dict(doc['ix'].replace(COLON, ':'))
+        string_to_dict(doc.get('ix', '').replace(COLON, ':'))
         for doc in self.read_docs(
             pipe.target,
             begin=begin,

meerschaum/utils/dtypes/__init__.py

@@ -284,4 +284,7 @@ def coerce_timezone(
             return dt
         return dt.replace(tzinfo=timezone.utc)
 
-    return dt.astimezone(timezone.utc)
+    utc_dt = dt.astimezone(timezone.utc)
+    if strip_utc:
+        return utc_dt.replace(tzinfo=None)
+    return utc_dt

meerschaum/utils/sql.py

@@ -338,7 +338,7 @@ columns_indices_queries = {
             AND kc.name = i.name
         WHERE
             t.name IN ('{table}', '{table_trunc}')
-            AND s.name = 'dbo'
+            AND s.name = '{schema}'
             AND i.type IN (1, 2)  -- 1 = CLUSTERED, 2 = NONCLUSTERED
     """,
     'oracle': """

{meerschaum-2.6.2.dist-info → meerschaum-2.6.4.dist-info}/METADATA

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

{meerschaum-2.6.2.dist-info → meerschaum-2.6.4.dist-info}/RECORD

@@ -143,7 +143,7 @@ meerschaum/config/_preprocess.py,sha256=-AEA8m_--KivZwTQ1sWN6LTn5sio_fUr2XZ51BO6
 meerschaum/config/_read_config.py,sha256=RLC3HHi_1ndj7ITVDKLD9_uULY3caGRwSz3ATYE-ixA,15014
 meerschaum/config/_shell.py,sha256=46_m49Txc5q1rGfCgO49ca48BODx45DQJi8D0zz1R18,4245
 meerschaum/config/_sync.py,sha256=jHcWRkxd82_BgX8Xo8agsWvf7BSbv3qHLWmYl6ehp_0,4242
-meerschaum/config/_version.py,sha256=d8xmvzQhjJaTXIL1biajSttQbEC_3d_dwhdHklxC0T0,71
+meerschaum/config/_version.py,sha256=4eIl_7moVKoxsMyo0qCguh4EcPNEy01cchxFmp4RlJA,71
 meerschaum/config/paths.py,sha256=JjibeGN3YAdSNceRwsd42aNmeUrIgM6ndzC8qZAmNI0,621
 meerschaum/config/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 meerschaum/config/stack/__init__.py,sha256=2UukC0Lmk-aVL1o1qXzumqmuIrw3vu9fD7iCuz4XD4I,10544
@@ -176,9 +176,9 @@ meerschaum/connectors/sql/_cli.py,sha256=1SgnWeMIAihoxp4FzbNrcq1npXf0dSOQnCntpU9
 meerschaum/connectors/sql/_create_engine.py,sha256=zqeu1xHOw3n3Zgfjx-diy2aoynfdOlfOjwFuRrzB028,10452
 meerschaum/connectors/sql/_fetch.py,sha256=A2R1aLgdEkiIet8P2BZ13OXy31I5e8BzWee74Bj_v4k,13141
 meerschaum/connectors/sql/_instance.py,sha256=3KJI3ImwWAJkUfdZIrSL24pcW6Nic8wo5IUeGth9HP4,6459
-meerschaum/connectors/sql/_pipes.py,sha256=Y217b5n7iFbDJVHbf2Kg-tiIgkgfKELgp_MkNGjL0Y4,116199
+meerschaum/connectors/sql/_pipes.py,sha256=Y0FK8juJ072bL8p0gl2VtXtZ1bMuvVDQ-AgAFD-bzIU,117070
 meerschaum/connectors/sql/_plugins.py,sha256=wbxcNxqTtjfDsxPvdVGTllasYf6NHHzODaQ72hEUSBQ,8135
-meerschaum/connectors/sql/_sql.py,sha256=qPJbm0dAC3oY4ZrCFnkFCI74OqwFBWlhJnryr9faao4,37597
+meerschaum/connectors/sql/_sql.py,sha256=vdSslLKm8ftzIzfCs-0mL3q9zY2pmhZPTpzXSbKROag,37598
 meerschaum/connectors/sql/_uri.py,sha256=0BrhQtqQdzg9mR04gWBZINs_BbPFtSlTECXT_TCUwik,3460
 meerschaum/connectors/sql/_users.py,sha256=FJjYeJGhr-TDHziNc6p_5mupGRtGjezKPIYgHFEVSnY,9956
 meerschaum/connectors/sql/tools.py,sha256=jz8huOaRCwGlYdtGfAqAh7SoK8uydYBrasKQba9FT38,187
@@ -187,7 +187,7 @@ meerschaum/connectors/sql/tables/types.py,sha256=Jc_MTHIBM-KHpQt__Lckp39CeOo7tGO
 meerschaum/connectors/valkey/_ValkeyConnector.py,sha256=xHld4OCnt0SXmAWH8Yintb3931F-MEgXfWerhTthsXc,15849
 meerschaum/connectors/valkey/__init__.py,sha256=jkVutsygQCvGPLN17cP6wHAjHajxVycnQJbm2eVMuY0,187
 meerschaum/connectors/valkey/_fetch.py,sha256=MjeE0h3YI4M3LCzy7axQAc_fX_l82vUqX4WXcYoppxE,1920
-meerschaum/connectors/valkey/_pipes.py,sha256=9sdKl605cNuE6rx4hlwgKEiIlU4fomtrz5nG_z8yxEU,22842
+meerschaum/connectors/valkey/_pipes.py,sha256=v-XSYSgaaaih6pNua9ExW5mix3HELfxJIRcIv26ti2o,22850
 meerschaum/connectors/valkey/_plugins.py,sha256=ZqiEW4XZCOpw4G8DUK2IKY6Qrph4mYfTjgXWimgakYY,6267
 meerschaum/connectors/valkey/_users.py,sha256=AS1vLarrkDA9yPK644GWwRiQiTZVa9x3nlLpyntq40g,7730
 meerschaum/core/__init__.py,sha256=tjASW10n9uLV6bYhcwP4rggh-ESXSJzgxpSBbVsuISs,251
@@ -228,7 +228,7 @@ meerschaum/utils/pool.py,sha256=vkE42af4fjrTEJTxf6Ek3xGucm1MtEkpsSEiaVzNKHs,2655
 meerschaum/utils/process.py,sha256=9O8PPPJjY9Q5W2f39I3B3lFU6TlSiRiI3bgrzdOOyOw,7843
 meerschaum/utils/prompt.py,sha256=6J--mZJ_NcEdSX6KMjtY4fXXezyILLHP24VdxFFqOIc,18985
 meerschaum/utils/schedule.py,sha256=9BQGEzDbInLAU1aFO-FvL3wKu9XCTUpS0V_aQID6xzc,11228
-meerschaum/utils/sql.py,sha256=DYQRbeL2lFVj8pyn4MIJv7pQCvjOkMAvVV6ZSjlDulI,70985
+meerschaum/utils/sql.py,sha256=UYDWMMNsZVau0-q1FpeTtaRcINmAk_PKRyzPdbSfk1g,70990
 meerschaum/utils/threading.py,sha256=3N8JXPAnwqJiSjuQcbbJg3Rv9-CCUMJpeQRfKFR7MaA,2489
 meerschaum/utils/typing.py,sha256=U3MC347sh1umpa3Xr1k71eADyDmk4LB6TnVCpq8dVzI,2830
 meerschaum/utils/warnings.py,sha256=n-phr3BftNNgyPnvnXC_VMSjtCvjiCZ-ewmVfcROhkc,6611
@@ -239,7 +239,7 @@ meerschaum/utils/daemon/RotatingFile.py,sha256=ePm_svjwyFDWh6V1k-bp1RHXCSWlyxDtl
 meerschaum/utils/daemon/StdinFile.py,sha256=J6tyUReM8NEp3bBQAxMfe8mjJG5mWi6CzHN4x86VQBI,3237
 meerschaum/utils/daemon/__init__.py,sha256=o9jWb4lRTIyny4EPt7fPXFgV_vIf1mUofsTwoE1ZecA,8751
 meerschaum/utils/daemon/_names.py,sha256=d2ZwTxBoTAqXZkCfZ5LuX2XrkQmLNUq1OTlUqfoH5dA,4515
-meerschaum/utils/dtypes/__init__.py,sha256=xK7duStyLFWaeeaPpz-xBAnOlC0TZ40_1Ja9Q7Mz-sM,7944
+meerschaum/utils/dtypes/__init__.py,sha256=10KfOPWwrZ9W-K1RDJivSDZyTjW-YPnppcJDUId4oaA,8025
 meerschaum/utils/dtypes/sql.py,sha256=IQihwQy4OKSbRjvJy6ky6SszFKR7W1iMs-ruZDsf2js,18701
 meerschaum/utils/formatting/__init__.py,sha256=GpJQWeqkdWw5IuDmW4Rgmapjzv-KkI4jhBZllJi4QIg,15999
 meerschaum/utils/formatting/_jobs.py,sha256=izsqPJhTtUkXUUtWnbXtReYsUYwulXtci3pBj72Ne64,6637
@@ -251,11 +251,11 @@ meerschaum/utils/packages/_packages.py,sha256=KqQqa5ipPMuzEwy0IO3sWXbw7fLk552fZ-
 meerschaum/utils/packages/lazy_loader.py,sha256=VHnph3VozH29R4JnSSBfwtA5WKZYZQFT_GeQSShCnuc,2540
 meerschaum/utils/venv/_Venv.py,sha256=sBnlmxHdAh2bx8btfVoD79-H9-cYsv5lP02IIXkyECs,3553
 meerschaum/utils/venv/__init__.py,sha256=f3oi67lXYPLKJrnRW9lae7M3A8SFiC7DzaMoBdCVUFs,24609
-meerschaum-2.6.2.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
-meerschaum-2.6.2.dist-info/METADATA,sha256=iT_X9IDavuFKnTHam8JcTzOA0spGl0PCAcKTsEDfl1U,24704
-meerschaum-2.6.2.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
-meerschaum-2.6.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-meerschaum-2.6.2.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
-meerschaum-2.6.2.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
-meerschaum-2.6.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-meerschaum-2.6.2.dist-info/RECORD,,
+meerschaum-2.6.4.dist-info/LICENSE,sha256=jG2zQEdRNt88EgHUWPpXVWmOrOduUQRx7MnYV9YIPaw,11359
+meerschaum-2.6.4.dist-info/METADATA,sha256=UoADLtMTPjwLxjH1WuT5U0GWYXDgnx84QVPy_XCXeNU,24704
+meerschaum-2.6.4.dist-info/NOTICE,sha256=OTA9Fcthjf5BRvWDDIcBC_xfLpeDV-RPZh3M-HQBRtQ,114
+meerschaum-2.6.4.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+meerschaum-2.6.4.dist-info/entry_points.txt,sha256=5YBVzibw-0rNA_1VjB16z5GABsOGf-CDhW4yqH8C7Gc,88
+meerschaum-2.6.4.dist-info/top_level.txt,sha256=bNoSiDj0El6buocix-FRoAtJOeq1qOF5rRm2u9i7Q6A,11
+meerschaum-2.6.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+meerschaum-2.6.4.dist-info/RECORD,,