sql-blocks 1.2025.1002__py3-none-any.whl → 1.20250709__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
sql_blocks/sql_blocks.py CHANGED
@@ -971,8 +971,9 @@ class GroupBy(Clause):
971
971
  fields += query.values.get(SELECT, [])
972
972
  query.add(alias, main)
973
973
  if not func:
974
- fields = [self.format(name, main)]
974
+ fields += [self.format(name, main)]
975
975
  for field in fields:
976
+ field = re.split(r'\s+(AS|as)\s+', field)[-1]
976
977
  main.values.setdefault(GROUP_BY, []).append(field)
977
978
 
978
979
  @classmethod
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: sql_blocks
3
- Version: 1.2025.1002
3
+ Version: 1.20250709
4
4
  Summary: Allows you to create objects for parts of SQL query commands. Also to combine these objects by joining them, adding or removing parts...
5
5
  Home-page: https://github.com/julio-cascalles/sql_blocks
6
6
  Author: Júlio Cascalles
@@ -0,0 +1,7 @@
1
+ sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
2
+ sql_blocks/sql_blocks.py,sha256=xyJGWgUf0nG7Vxcfy0DIjrvuCMGLRU3PGeg4UsZrRnY,80533
3
+ sql_blocks-1.20250709.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
4
+ sql_blocks-1.20250709.dist-info/METADATA,sha256=QzoGQNftNY_wHmpm3EkMcMDqgrA1OMtN79-f8jS0XV4,24416
5
+ sql_blocks-1.20250709.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
6
+ sql_blocks-1.20250709.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
7
+ sql_blocks-1.20250709.dist-info/RECORD,,
@@ -1,7 +0,0 @@
1
- sql_blocks/__init__.py,sha256=5ItzGCyqqa6kwY8wvF9kapyHsAiWJ7KEXCcC-OtdXKg,37
2
- sql_blocks/sql_blocks.py,sha256=QStl2invYAuvpSKkAqeutMlDgzOgNQvLF2pA8XK90aY,80473
3
- sql_blocks-1.2025.1002.dist-info/LICENSE,sha256=6kbiFSfobTZ7beWiKnHpN902HgBx-Jzgcme0SvKqhKY,1091
4
- sql_blocks-1.2025.1002.dist-info/METADATA,sha256=SOD6TNWQF46azhVlf7N1PHQX-Xgx0-CbqbAC7-1-cfc,24417
5
- sql_blocks-1.2025.1002.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
6
- sql_blocks-1.2025.1002.dist-info/top_level.txt,sha256=57AbUvUjYNy4m1EqDaU3WHeP-uyIAfV0n8GAUp1a1YQ,11
7
- sql_blocks-1.2025.1002.dist-info/RECORD,,