BezdarSQL 1.1__py3-none-any.whl → 1.1.1__py3-none-any.whl

bezdarsql/__init__.py

@@ -46,18 +46,25 @@ def select(table, value='*', filter_by=None, count=1):
         raise _e
 
 
-def select_join(tables, value='*', filter_on=(), count=1):
+def select_join(tables, value='*', filter_on=None, filter_by=None, count=1):
     request = f'select {value} from '
     for index, table in enumerate(tables):
         if index == 0:
             request += f'{table.__tablename__} '
         else:
             request += f'join {table.__tablename__} on '
-            for indexx, fil in enumerate(filter_on):
-                if indexx > 1:
-                    request += f'and {fil.owner.__tablename__}.{fil.name}={filter_on[fil].owner.__tablename__}.{filter_on[fil].name} '
-                else:
-                    request += f'{fil.owner.__tablename__}.{fil.name}={filter_on[fil].owner.__tablename__}.{filter_on[fil].name} '
+            if filter_on:
+                for indexx, fil in enumerate(filter_on):
+                    if indexx > 1:
+                        request += f'and {fil.owner.__tablename__}.{fil.name}={filter_on[fil].owner.__tablename__}.{filter_on[fil].name} '
+                    else:
+                        request += f'{fil.owner.__tablename__}.{fil.name}={filter_on[fil].owner.__tablename__}.{filter_on[fil].name} '
+            elif filter_by:
+                for index, fil in enumerate(filter_by):
+                    if index > 1:
+                        request += f'and {fil.owner.__tablename__}.{fil.name}={repr(filter_by[fil])} '
+                    else:
+                        request += f'{fil.owner.__tablename__}.{fil.name}={repr(filter_by[fil])} '
 
     try:
         with psycopg2.connect(

{bezdarsql-1.1.dist-info → bezdarsql-1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BezdarSQL
-Version: 1.1
+Version: 1.1.1
 Summary: My little SQL ORM for the ones who called bezdars
 Author-email: boliklevik@gmail.com
 Dynamic: author-email

bezdarsql-1.1.1.dist-info/RECORD

@@ -0,0 +1,7 @@
+bezdarsql/__init__.py,sha256=jLtkpXdJEz6zpfwo3OsYrYOyqKF4urOxJW6jfD-lLBE,6526
+bezdarsql/base.py,sha256=rck1yKK4jYmA8R5MFeZJSMQn5ycCDdSD6X2tbxMN9Lw,283
+bezdarsql/config.py,sha256=7ILEYbi1Bs_oMy5uesejLEV1mEGgxZtTjE1XTwbZXL0,208
+bezdarsql-1.1.1.dist-info/METADATA,sha256=v3YVF4RWHrCrdoahU0AL-DWKSE5SA1uyzkihaEzy8_U,186
+bezdarsql-1.1.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+bezdarsql-1.1.1.dist-info/top_level.txt,sha256=6Hm17vWV3AZOm7VuPVlThNi5KBr6BFO7-e9s7NifPsI,10
+bezdarsql-1.1.1.dist-info/RECORD,,

bezdarsql-1.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-bezdarsql/__init__.py,sha256=tlWXWfosQw-e_RZ0amoQZMrsKb3mZmmLzXngfjfHmVI,6116
-bezdarsql/base.py,sha256=rck1yKK4jYmA8R5MFeZJSMQn5ycCDdSD6X2tbxMN9Lw,283
-bezdarsql/config.py,sha256=7ILEYbi1Bs_oMy5uesejLEV1mEGgxZtTjE1XTwbZXL0,208
-bezdarsql-1.1.dist-info/METADATA,sha256=ZOADphl2bbPwSOdC_ZSzUlS4OTB6QGWgHDaAfPnc5Cc,184
-bezdarsql-1.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-bezdarsql-1.1.dist-info/top_level.txt,sha256=6Hm17vWV3AZOm7VuPVlThNi5KBr6BFO7-e9s7NifPsI,10
-bezdarsql-1.1.dist-info/RECORD,,