sqlnbfmt 0.1.4__tar.gz → 0.1.6__tar.gz

{sqlnbfmt-0.1.4/sqlnbfmt.egg-info → sqlnbfmt-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlnbfmt
-Version: 0.1.4
+Version: 0.1.6
 Summary: A tool to format SQL code in Jupyter notebooks.
 Author-email: Qing <qingye779@gmail.com>
 License: MIT
@@ -61,14 +61,13 @@ pip install pre-commit
 2. Add to `.pre-commit-config.yaml`:
 ```yaml
 repos:
-  - repo: local
+  - repo: https://github.com/flyersworder/sqlnbfmt
+    rev: v0.1.1
     hooks:
       - id: sqlnbfmt
         name: sqlnbfmt
-        entry: sqlnbfmt
-        language: system
         types: [jupyter]
-        args: [--config, config.yaml, --dialect, mysql]
+        args: [--config, config.yaml, --dialect, postgres]
 ```
 Please fun the following command in your CMD for help:
 

{sqlnbfmt-0.1.4 → sqlnbfmt-0.1.6}/README.md

@@ -45,14 +45,13 @@ pip install pre-commit
 2. Add to `.pre-commit-config.yaml`:
 ```yaml
 repos:
-  - repo: local
+  - repo: https://github.com/flyersworder/sqlnbfmt
+    rev: v0.1.1
     hooks:
       - id: sqlnbfmt
         name: sqlnbfmt
-        entry: sqlnbfmt
-        language: system
         types: [jupyter]
-        args: [--config, config.yaml, --dialect, mysql]
+        args: [--config, config.yaml, --dialect, postgres]
 ```
 Please fun the following command in your CMD for help:
 
@@ -140,4 +139,4 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
 - All contributors and early adopters who helped shape this tool
 
 ---
-Made with ♥️ by the sqlnbfmt team
+Made with ♥️ by the sqlnbfmt team

{sqlnbfmt-0.1.4 → sqlnbfmt-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sqlnbfmt"
-version = "0.1.4"
+version = "0.1.6"
 description = "A tool to format SQL code in Jupyter notebooks."
 authors = [
   { name = "Qing", email = "qingye779@gmail.com" }

{sqlnbfmt-0.1.4 → sqlnbfmt-0.1.6}/sqlnbfmt/formatter.py

@@ -223,27 +223,42 @@ class SQLStringFormatter(ast.NodeTransformer):
         return "".join(sql_parts), placeholders
 
     def format_sql_node(
-        self, node: Union[ast.Constant, ast.JoinedStr], force_single_line: bool = False
+        self, 
+        node: Union[ast.Constant, ast.JoinedStr], 
+        force_single_line: bool = False,
+        in_function: bool = False
     ) -> Optional[ast.AST]:
         """Formats SQL code in AST nodes."""
         try:
             if isinstance(node, ast.Constant) and isinstance(node.value, str):
                 if not self.is_likely_sql(node.value):
                     return None
+
                 formatted_sql = format_sql_code(
                     node.value,
                     self.dialect,
                     self.config,
                     force_single_line=force_single_line,
                 )
+
                 if formatted_sql != node.value:
                     self.changed = True
-                    # Reconstruct the string with adjusted triple quotes
-                    if '\n' in formatted_sql:
+                    if in_function and '\n' in formatted_sql:
+                        # Apply Black-style indentation for function arguments
+                        lines = formatted_sql.split('\n')
+                        # Indent all lines including the first SQL line
+                        indented_lines = [
+                            " " * 4 + line if line.strip() else line
+                            for line in lines
+                        ]
+                        formatted_sql = '\n'.join(indented_lines)
+                        
+                        # Reconstruct the string with appropriate quotes
                         formatted_str = f'"""\n{formatted_sql}\n"""'
                     else:
-                        formatted_str = f'"""{formatted_sql}"""'
-                    # Parse the formatted string back into an AST node
+                        # Ensure newlines are added around the formatted SQL
+                        formatted_str = f'"""\n{formatted_sql}\n"""'
+                    
                     formatted_node = ast.parse(formatted_str).body[0].value
                     return formatted_node
 
@@ -265,18 +280,26 @@ class SQLStringFormatter(ast.NodeTransformer):
 
                 if placeholders:
                     for placeholder in placeholders.keys():
-                        if not placeholder:  # Skip empty placeholders
+                        if not placeholder:
                             continue
-                        # Remove quotes around placeholders in formatted SQL
                         formatted_sql = formatted_sql.replace(f"'{placeholder}'", placeholder)
                         formatted_sql = formatted_sql.replace(f'"{placeholder}"', placeholder)
 
                 if formatted_sql != sql_str:
                     self.changed = True
+                    # Apply Black-style indentation for function arguments
+                    if in_function and '\n' in formatted_sql:
+                        lines = formatted_sql.split('\n')
+                        # Indent all lines including the first SQL line
+                        indented_lines = [
+                            " " * 4 + line if line.strip() else line
+                            for line in lines
+                        ]
+                        formatted_sql = '\n'.join(indented_lines)
+
                     # Reconstruct the f-string
                     new_values = []
                     if not placeholders:
-                        # If no placeholders, just create a simple f-string
                         new_values.append(ast.Constant(value=formatted_sql))
                     else:
                         pattern = re.compile('|'.join(re.escape(k) for k in placeholders.keys() if k))
@@ -285,7 +308,6 @@ class SQLStringFormatter(ast.NodeTransformer):
                             match = pattern.search(formatted_sql, idx)
                             if match:
                                 if match.start() > idx:
-                                    # Add preceding text as Constant
                                     new_values.append(ast.Constant(value=formatted_sql[idx:match.start()]))
                                 placeholder = match.group()
                                 expr_str = placeholders[placeholder].strip()
@@ -301,23 +323,20 @@ class SQLStringFormatter(ast.NodeTransformer):
                                 ))
                                 idx = match.end()
                             else:
-                                # Add the rest of the string as Constant
                                 new_values.append(ast.Constant(value=formatted_sql[idx:]))
                                 break
 
                     new_node = ast.JoinedStr(values=new_values)
-                    # Wrap the f-string with adjusted triple quotes
                     if '\n' in formatted_sql:
-                        # Multi-line f-string
                         formatted_fstring = ast.JoinedStr(values=[
                             ast.Constant(value='\n'),
                             *new_node.values,
                             ast.Constant(value='\n')
                         ])
                     else:
-                        # Single-line f-string
                         formatted_fstring = new_node
                     return formatted_fstring
+
             return None
         except SQLFormattingError as e:
             self.logger.warning(f"SQL formatting skipped: {e}")
@@ -340,12 +359,13 @@ class SQLStringFormatter(ast.NodeTransformer):
         if any(name in func_name for name in self.config.function_names):
             for idx, arg in enumerate(node.args):
                 if isinstance(arg, (ast.Constant, ast.JoinedStr)):
-                    formatted_node = self.format_sql_node(arg)
+                    # Format with Black-style indentation for function arguments
+                    formatted_node = self.format_sql_node(arg, in_function=True)
                     if formatted_node:
                         node.args[idx] = formatted_node
             for keyword in node.keywords:
                 if isinstance(keyword.value, (ast.Constant, ast.JoinedStr)):
-                    formatted_node = self.format_sql_node(keyword.value)
+                    formatted_node = self.format_sql_node(keyword.value, in_function=True)
                     if formatted_node:
                         keyword.value = formatted_node
         return self.generic_visit(node)

{sqlnbfmt-0.1.4 → sqlnbfmt-0.1.6/sqlnbfmt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlnbfmt
-Version: 0.1.4
+Version: 0.1.6
 Summary: A tool to format SQL code in Jupyter notebooks.
 Author-email: Qing <qingye779@gmail.com>
 License: MIT
@@ -61,14 +61,13 @@ pip install pre-commit
 2. Add to `.pre-commit-config.yaml`:
 ```yaml
 repos:
-  - repo: local
+  - repo: https://github.com/flyersworder/sqlnbfmt
+    rev: v0.1.1
     hooks:
       - id: sqlnbfmt
         name: sqlnbfmt
-        entry: sqlnbfmt
-        language: system
         types: [jupyter]
-        args: [--config, config.yaml, --dialect, mysql]
+        args: [--config, config.yaml, --dialect, postgres]
 ```
 Please fun the following command in your CMD for help: