tablemaster 2.1.6__tar.gz → 2.1.8__tar.gz

{tablemaster-2.1.6 → tablemaster-2.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tablemaster
-Version: 2.1.6
+Version: 2.1.8
 Summary: tablemaster is a Python toolkit for moving and managing tabular data across databases, Feishu/Lark, Google Sheets, and local files with one consistent API.
 Author-email: Livid <livid.su@gmail.com>
 Project-URL: Homepage, https://github.com/ilivid/tablemaster

{tablemaster-2.1.6 → tablemaster-2.1.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tablemaster"
-version = "2.1.6"
+version = "2.1.8"
 description = "tablemaster is a Python toolkit for moving and managing tabular data across databases, Feishu/Lark, Google Sheets, and local files with one consistent API."
 readme = "README.md"
 requires-python = ">=3.9"

{tablemaster-2.1.6 → tablemaster-2.1.8}/tablemaster/feishu.py

@@ -226,15 +226,38 @@ def fs_write_df(sheet_address, df, feishu_cfg, loc='A1', clear_sheet=True):
     
     # 清空工作表（如果需要）
     if clear_sheet:
-        logger.info('clearing sheet by values_batch_clear api')
+        logger.info('clearing sheet before writing')
         try:
-            clear_url = f"https://open.feishu.cn/open-apis/sheets/v2/spreadsheets/{spreadsheet_token}/values_batch_clear"
             clear_data = {"ranges": [f"{sheet_id}!A1:XFD1048576"]}
-            clear_resp = _request_with_retry("post", clear_url, headers=header, json_data=clear_data)
-            if clear_resp.json().get('code') == 0:
-                logger.info('sheet cleared')
-            else:
-                raise RuntimeError(f"failed to clear sheet: {clear_resp.json().get('msg')}")
+            clear_urls = [
+                f"https://open.feishu.cn/open-apis/sheets/v2/spreadsheets/{spreadsheet_token}/values_batch_clear",
+                f"https://open.feishu.cn/open-apis/sheets/v2/spreadsheets/{spreadsheet_token}/values/batch_clear",
+                f"https://open.feishu.cn/open-apis/sheets/v2/spreadsheets/{spreadsheet_token}/values_batch_clear/",
+            ]
+            clear_ok = False
+            last_error = None
+
+            for clear_url in clear_urls:
+                clear_resp = _request_with_retry("post", clear_url, headers=header, json_data=clear_data)
+                if clear_resp.status_code == 404:
+                    last_error = requests.HTTPError(
+                        f'clear sheet endpoint not found: {clear_url}',
+                        response=clear_resp
+                    )
+                    logger.warning('clear endpoint 404, try next: %s', clear_url)
+                    continue
+                clear_body = _parse_json_response(clear_resp, f'clear sheet ({clear_url})')
+                _ensure_feishu_success(clear_body, f'clear sheet ({clear_url})')
+                clear_ok = True
+                logger.info('sheet cleared by endpoint: %s', clear_url)
+                break
+
+            if not clear_ok:
+                logger.warning(
+                    'skip clear sheet because all clear endpoints returned 404; '
+                    'writing will continue and old trailing cells may remain. last_error=%s',
+                    last_error
+                )
         except Exception as e:
             logger.exception('failed to clear sheet: %s', e)
             raise
@@ -296,14 +319,9 @@ def fs_write_df(sheet_address, df, feishu_cfg, loc='A1', clear_sheet=True):
     
     try:
         r = _request_with_retry("put", url, headers=header, json_data=post_data)
-        response = r.json()
-        
-        if response.get('code') == 0:
-            logger.info('data is written')
-        else:
-            logger.error('failed to write data: %s', response.get('msg', 'Unknown error'))
-            logger.error('error code: %s', response.get('code'))
-        
+        response = _parse_json_response(r, 'write sheets values')
+        _ensure_feishu_success(response, 'write sheets values')
+        logger.info('data is written')
         return response
         
     except Exception as e:

{tablemaster-2.1.6 → tablemaster-2.1.8}/tablemaster/schema/diff.py

@@ -1,12 +1,33 @@
 from __future__ import annotations
 
+import re
+
 from .dialects.base import BaseDialect
 from .models import ActualTable, ColumnDef, Plan, PlanAction, TableDef
 
 
-def _norm_default(value: str | None) -> str | None:
+def _strip_outer_parens(value: str) -> str:
+    result = value.strip()
+    while result.startswith('(') and result.endswith(')'):
+        result = result[1:-1].strip()
+    return result
+
+
+def _normalize_pg_default(value: str) -> str:
+    normalized = _strip_outer_parens(value)
+    # PostgreSQL introspection often returns defaults like: 'N'::bpchar
+    # or ('unknown'::character varying). Strip trailing casts for comparison.
+    normalized = re.sub(r"::[a-zA-Z_][a-zA-Z0-9_\[\]\.\s]*$", '', normalized).strip()
+    if normalized.startswith("'") and normalized.endswith("'") and len(normalized) >= 2:
+        normalized = normalized[1:-1].replace("''", "'")
+    return normalized.upper()
+
+
+def _norm_default(value: str | None, dialect: BaseDialect) -> str | None:
     if value is None:
         return None
+    if dialect.__class__.__name__ == 'PostgreSQLDialect':
+        return _normalize_pg_default(value)
     return value.strip().strip("'").upper()
 
 
@@ -161,7 +182,7 @@ def generate_plan(
                     )
                 )
 
-            if _norm_default(desired_col.default) != _norm_default(actual_col.default):
+            if _norm_default(desired_col.default, dialect) != _norm_default(actual_col.default, dialect):
                 plan.actions.append(
                     _action(
                         'ALTER_COLUMN_DEFAULT',

{tablemaster-2.1.6 → tablemaster-2.1.8}/tablemaster.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tablemaster
-Version: 2.1.6
+Version: 2.1.8
 Summary: tablemaster is a Python toolkit for moving and managing tabular data across databases, Feishu/Lark, Google Sheets, and local files with one consistent API.
 Author-email: Livid <livid.su@gmail.com>
 Project-URL: Homepage, https://github.com/ilivid/tablemaster

{tablemaster-2.1.6 → tablemaster-2.1.8}/tests/test_schema_core.py

@@ -244,6 +244,43 @@ class SchemaCoreTests(unittest.TestCase):
             )
             self.assertTrue(any(a.action == 'ADD_PRIMARY_KEY' for a in plan.actions))
 
+    def test_postgresql_default_literal_with_cast_not_repeated(self):
+        with TemporaryDirectory() as td:
+            root = Path(td)
+            schema_dir = root / 'schema' / 'mydb'
+            schema_dir.mkdir(parents=True, exist_ok=True)
+            (schema_dir / 'orders.yaml').write_text(
+                '\n'.join(
+                    [
+                        'table: orders',
+                        'columns:',
+                        '  - name: archive',
+                        '    type: CHAR(1)',
+                        '    nullable: false',
+                        '    default: "\'N\'"',
+                    ]
+                ),
+                encoding='utf-8',
+            )
+            desired = load_schema_definitions(connection='mydb', root_dir=root / 'schema')
+            actual = [
+                ActualTable(
+                    table='orders',
+                    columns=[
+                        ActualColumn(
+                            name='archive',
+                            type='character(1)',
+                            nullable=False,
+                            default="'N'::bpchar",
+                            comment=None,
+                        )
+                    ],
+                    indexes=[],
+                )
+            ]
+            plan = generate_plan('mydb', desired, actual, PostgreSQLDialect())
+            self.assertFalse(any(a.action == 'ALTER_COLUMN_DEFAULT' for a in plan.actions))
+
 
 if __name__ == '__main__':
     unittest.main()