BezdarSQL 1.1__py3-none-any.whl → 1.1.2__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(
@@ -134,11 +141,11 @@ def update(table, **kwargs):
     request = f'update {table.__tablename__} set '
     values = kwargs['values']
     for index, value in enumerate(values):
-        request += f'{value}={repr(values[value])} ' + (', ' if index + 1 != len(values) else 'where ')
+        request += f'{value.name}={repr(values[value])} ' + (', ' if index + 1 != len(values) else 'where ')
 
     where_s = kwargs['where']
     for index, where in enumerate(where_s):
-        request += f'{where}={repr(where_s[where])} ' + (', ' if index + 1 != len(where_s) else ';')
+        request += f'{where.owner.__tablename__}.{where.name}={repr(where_s[where])} ' + (', ' if index + 1 != len(where_s) else ';')
 
     try:
         with psycopg2.connect(
@@ -162,7 +169,7 @@ def delete(table, **kwargs):
     request = f'delete from {table.__tablename__} where '
     where_s = kwargs['where']
     for index, where in enumerate(where_s):
-        request += f'{where}={repr(where_s[where])} ' + ('and ' if index + 1 != len(where_s) else ';')
+        request += f'{where.owner.__tablename__}.{where.name}={repr(where_s[where])}' + ('and ' if index + 1 != len(where_s) else ';')
 
     try:
         with psycopg2.connect(

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

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

bezdarsql-1.1.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+bezdarsql/__init__.py,sha256=p22Tr1FIBF_4GkgvxvdH32h1SzkHH-l52QZqCyDGg40,6596
+bezdarsql/base.py,sha256=rck1yKK4jYmA8R5MFeZJSMQn5ycCDdSD6X2tbxMN9Lw,283
+bezdarsql/config.py,sha256=7ILEYbi1Bs_oMy5uesejLEV1mEGgxZtTjE1XTwbZXL0,208
+bezdarsql-1.1.2.dist-info/METADATA,sha256=bG24egg3Px6UisB_W4KipnuAsoOKpT9W2hPHUVYULVc,186
+bezdarsql-1.1.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+bezdarsql-1.1.2.dist-info/top_level.txt,sha256=6Hm17vWV3AZOm7VuPVlThNi5KBr6BFO7-e9s7NifPsI,10
+bezdarsql-1.1.2.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,,