reydb 1.3.3__py3-none-any.whl → 1.3.5__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.
reydb/rexec.py CHANGED
@@ -673,15 +673,11 @@ class DatabaseExecute(DatabaseExecuteSuper['rconn.DatabaseConnection']):
673
673
  f'{report_runtime}\n'
674
674
  f'Row Count: {result.rowcount}'
675
675
  )
676
- sqls = [
677
- sql_part.strip()
678
- for sql_part in sql.text.split(';')
679
- if sql_part != ''
680
- ]
676
+ sql = sql.text.strip()
681
677
  if data == []:
682
- recho(report_info, *sqls, title='SQL')
678
+ recho(report_info, sql, title='SQL')
683
679
  else:
684
- recho(report_info, *sqls, data, title='SQL')
680
+ recho(report_info, sql, data, title='SQL')
685
681
 
686
682
  ## Not report.
687
683
  else:
@@ -1217,16 +1213,11 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
1217
1213
  f'{report_runtime}\n'
1218
1214
  f'Row Count: {result.rowcount}'
1219
1215
  )
1220
- sqls = [
1221
- sql_part.strip()
1222
- for sql_part in sql.text.split(';')
1223
- if sql_part != ''
1224
- ]
1225
-
1216
+ sql = sql.text.strip()
1226
1217
  if data == []:
1227
- recho(report_info, *sqls, title='SQL')
1218
+ recho(report_info, sql, title='SQL')
1228
1219
  else:
1229
- recho(report_info, *sqls, data, title='SQL')
1220
+ recho(report_info, sql, data, title='SQL')
1230
1221
 
1231
1222
  ## Not report.
1232
1223
  else:
reydb/rorm.py CHANGED
@@ -332,15 +332,10 @@ class DatabaseORMModelField(DatabaseORMBase, FieldInfo):
332
332
  ## Field default.
333
333
  if 'field_default' in kwargs:
334
334
  field_default: str = kwargs.pop('field_default')
335
- if field_default == ':time':
336
- field_default = sqlalchemy_text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')
337
335
  if field_default == ':create_time':
338
336
  field_default = sqlalchemy_text('CURRENT_TIMESTAMP')
339
337
  elif field_default == ':update_time':
340
- if kwargs['nullable']:
341
- field_default = sqlalchemy_text('NULL ON UPDATE CURRENT_TIMESTAMP')
342
- else:
343
- field_default = sqlalchemy_text('NOT NULL ON UPDATE CURRENT_TIMESTAMP')
338
+ field_default = sqlalchemy_text('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP')
344
339
  kwargs['sa_column_kwargs']['server_default'] = field_default
345
340
 
346
341
  ## Argument default.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: reydb
3
- Version: 1.3.3
3
+ Version: 1.3.5
4
4
  Summary: Database method set.
5
5
  Project-URL: homepage, https://github.com/reyxbo/reydb/
6
6
  Author-email: Rey <reyxbo@163.com>
@@ -7,10 +7,10 @@ reydb/rconn.py,sha256=K_k6cJ94yrPIFaSZ06enpguTWVPhDu67LHan41C1bRA,7023
7
7
  reydb/rdb.py,sha256=LblF7igyr5y1lyrSRZIKcYI9M9rzWG-mdcJYWINlARw,4014
8
8
  reydb/rengine.py,sha256=qkpEsfHleia-bT7DBgERpSlZfszB5mLbRACtG-H2D-s,15640
9
9
  reydb/rerror.py,sha256=M7RPXwywLYl5Vew7jfXxUxVnBrM1b_T6V9Izt4B8zI0,14791
10
- reydb/rexec.py,sha256=hZe5SRbqo_aTpuB1vI2HXVx1FjtwvKGLRom3uzjTuqI,52949
10
+ reydb/rexec.py,sha256=Bbjqh0e3dE_NRnSfKfyfyyzAvXKdzXT5JLuzufHuH_s,52693
11
11
  reydb/rinfo.py,sha256=c5otyOikGMVnLFhPbtlgmnFBRR3NMP7xcmMW-LQdaQk,18314
12
- reydb/rorm.py,sha256=q_S80zHRausLMYrajQEDpK7fItuqnTtFs_VrkJGZU8Y,50289
13
- reydb-1.3.3.dist-info/METADATA,sha256=tgoOQ1-C6CvudX54Z1ye8EssG1Sg4falfcnB0ifz3O4,1653
14
- reydb-1.3.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
15
- reydb-1.3.3.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
16
- reydb-1.3.3.dist-info/RECORD,,
12
+ reydb/rorm.py,sha256=UHZVNHkQ31RyJ5Ia9wmJ8ammIz59KKYOKh9HX6VEHX4,50002
13
+ reydb-1.3.5.dist-info/METADATA,sha256=mxZmvHnUjHkt1iyQSfuaah-57VMDfbkwEvN0TDBqKZ0,1653
14
+ reydb-1.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
15
+ reydb-1.3.5.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
16
+ reydb-1.3.5.dist-info/RECORD,,
File without changes