liberty-framework 6.0.75__py3-none-any.whl → 6.0.77__py3-none-any.whl

liberty/framework/setup/models/nomasx1.py

@@ -217,13 +217,23 @@ class IDollarLicenseJdeOut(Base):
     lout_usage = Column(DATE, primary_key=False, nullable=False)
 
 
+class IDollarLicenseJdeOutObjects(Base):
+    __tablename__ = 'i$_license_jde_out_objects'
+    lout_apps_id = Column(INTEGER, primary_key=True, nullable=False)
+    lout_object = Column(VARCHAR(10), primary_key=True, nullable=False)
+    lout_version = Column(VARCHAR(10), primary_key=True, nullable=False)
+    lout_type = Column(VARCHAR(10), primary_key=False, nullable=True)
+    lout_usage = Column(DATE, primary_key=False, nullable=False)
+    lout_count = Column(INTEGER, primary_key=False, nullable=True)
+
+
 class IDollarLicenseJdeOutUsers(Base):
     __tablename__ = 'i$_license_jde_out_users'
     lout_apps_id = Column(INTEGER, primary_key=True, nullable=False)
     lout_user = Column(VARCHAR(40), primary_key=True, nullable=False)
     lout_usage = Column(DATE, primary_key=True, nullable=False)
-    lout_role = Column(VARCHAR(40), primary_key=False, nullable=False)
-    lout_env = Column(VARCHAR(40), primary_key=False, nullable=False)
+    lout_role = Column(VARCHAR(40), primary_key=True, nullable=False)
+    lout_env = Column(VARCHAR(40), primary_key=True, nullable=False)
 
 
 class IDollarRolSecurityRights(Base):
@@ -296,7 +306,7 @@ class JdeObjects(Base):
     __tablename__ = 'jde_objects'
     jdeo_apps_id = Column(INTEGER, primary_key=True, nullable=False)
     jdeo_object = Column(VARCHAR(10), primary_key=True, nullable=False)
-    jdeo_description = Column(VARCHAR(60), primary_key=False, nullable=True)
+    jdeo_description = Column(VARCHAR(100), primary_key=False, nullable=True)
     jdeo_sy = Column(VARCHAR(10), primary_key=False, nullable=True)
     jdeo_type = Column(VARCHAR(4), primary_key=False, nullable=True)
     jdeo_ukid = Column(INTEGER, primary_key=False, nullable=True)
@@ -307,7 +317,7 @@ class JdeObjectsVersions(Base):
     jdeo_apps_id = Column(INTEGER, primary_key=True, nullable=False)
     jdeo_object = Column(VARCHAR(10), primary_key=True, nullable=False)
     jdeo_version = Column(VARCHAR(10), primary_key=True, nullable=False)
-    jdeo_description = Column(VARCHAR(60), primary_key=False, nullable=True)
+    jdeo_description = Column(VARCHAR(100), primary_key=False, nullable=True)
     jdeo_sy = Column(VARCHAR(4), primary_key=False, nullable=True)
     jdeo_type = Column(VARCHAR(4), primary_key=False, nullable=True)
     jdeo_ukid = Column(INTEGER, primary_key=False, nullable=True)
@@ -423,13 +433,23 @@ class LicenseJdeOut(Base):
 
 
 
+class LicenseJdeOutObjects(Base):
+    __tablename__ = 'license_jde_out_objects'
+    lout_apps_id = Column(INTEGER, primary_key=True, nullable=False)
+    lout_object = Column(VARCHAR(10), primary_key=True, nullable=False)
+    lout_version = Column(VARCHAR(10), primary_key=True, nullable=False)
+    lout_type = Column(VARCHAR(10), primary_key=False, nullable=True)
+    lout_usage = Column(DATE, primary_key=False, nullable=False)
+    lout_count = Column(INTEGER, primary_key=False, nullable=True)
+
+
 class LicenseJdeOutUsers(Base):
     __tablename__ = 'license_jde_out_users'
     lout_apps_id = Column(INTEGER, primary_key=True, nullable=False)
     lout_user = Column(VARCHAR(40), primary_key=True, nullable=False)
     lout_usage = Column(DATE, primary_key=True, nullable=False)
-    lout_role = Column(VARCHAR(40), primary_key=False, nullable=False)
-    lout_env = Column(VARCHAR(40), primary_key=False, nullable=False)
+    lout_role = Column(VARCHAR(40), primary_key=True, nullable=False)
+    lout_env = Column(VARCHAR(40), primary_key=True, nullable=False)
 
 
 class LicenseJdeUsers(Base):
@@ -984,6 +1004,8 @@ class SettingsJdedwards(Base):
     jde_e1composite = Column(VARCHAR(1), primary_key=False, nullable=True)
     jde_audit_user = Column(VARCHAR(30), primary_key=False, nullable=True)
     jde_audit_date = Column(TIMESTAMP, primary_key=False, nullable=True)
+    jde_out_purge = Column(VARCHAR(1), primary_key=False, nullable=True)
+    jde_out_retention = Column(INTEGER, primary_key=False, nullable=True)
     __table_args__ = (
         ForeignKeyConstraint(["apps_id"], ["settings_applications.apps_id"], name="settingsjdedwards_fk1", ondelete="CASCADE"),
     )

liberty/framework/setup/services/dump.py

@@ -31,7 +31,7 @@ class Dump:
         self.jwt = jwt
 
         # Database configuration
-        DATABASE_URL = f"postgresql+psycopg2://{database}:{self.config["password"]}@{self.config["host"]}:{self.config["port"]}/{database}"
+        DATABASE_URL = f"postgresql+psycopg2://{database}:{self.config["password"]}@{self.config["host"]}:{self.config["port"]}/{database}?client_encoding=utf8"
 
         try:
             self.engine = create_engine(DATABASE_URL, echo=False, isolation_level="AUTOCOMMIT")

{liberty_framework-6.0.75.dist-info → liberty_framework-6.0.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liberty-framework
-Version: 6.0.75
+Version: 6.0.77
 Summary: Liberty Framework
 Author: Franck Blettner
 Author-email: franck.blettner@nomana-it.fr

{liberty_framework-6.0.75.dist-info → liberty_framework-6.0.77.dist-info}/RECORD

@@ -12,7 +12,7 @@ liberty/framework/business/postgres.py,sha256=ZcG04EtjFyRJIWx4tSE4knLR8cthN583Y6
 liberty/framework/config/__init__.py,sha256=3K_Nb8pNysyY47rqQZWnWfrQvyjhOHgBETS66tr00LM,687
 liberty/framework/config/files/liberty.ini,sha256=0ANiQl7foKKqrntBfAtTGlEK-COsJqUkOPdhinYpDi0,622
 liberty/framework/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-liberty/framework/controllers/api_controller.py,sha256=r_tCVdo2tzkffl4KvylRbkSW__GoXskiKxWGUAfMvkI,2800
+liberty/framework/controllers/api_controller.py,sha256=sm8VWS1XuS2uqPJaEZVVavO67XaZMWmAndrjCP9OiSU,2794
 liberty/framework/controllers/setup_controller.py,sha256=Y8PXHY_UGZovu4YtU4hZbU4zI_G8LXRZhf-31EtDxgE,1584
 liberty/framework/controllers/socket_controller.py,sha256=AsHKvp0YvZWKWYUu6U8AJslvlaBIKFGqORnHaVsjkZE,9236
 liberty/framework/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -32,23 +32,23 @@ liberty/framework/models/setup.py,sha256=BycjwHIbSAl-e_aCqjdmZH3rHFhyFiHcpnZ7BOB
 liberty/framework/models/themes.py,sha256=XTCpc2gGF-lg3k8abo_xsneTv3eXTnfHEEYpNLmpdd8,1272
 liberty/framework/postgres/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 liberty/framework/postgres/dump/__init__.py,sha256=OWyQ1sBi-sCO_wol4bhHA1boUkuqs8y3yAqndiSabHk,253
-liberty/framework/postgres/dump/airflow.dump,sha256=VgtBx6s12sSZV12ihayHfMWK5QIcrGG89ZyYpuuY7ZA,200295
-liberty/framework/postgres/dump/gitea.dump,sha256=wLa-8y6jnjlFTk7M9ctKjkR302tAb76TIjg9uX0wSgY,340364
-liberty/framework/postgres/dump/keycloak.dump,sha256=B-qztkTxNOxdMC9KJLhjiMTps_8cEVBc3nYtdo3PCKk,212519
-liberty/framework/postgres/dump/liberty.dump,sha256=8UVJwmlXm7ldRGIEUHVmKiYeT0VLj2yDrXtCld-Cclw,212937
-liberty/framework/postgres/dump/libnarf.dump,sha256=v8iG7E68t2ipxLHKya71CzcO09Co7o19UEW0Z6xph9k,129280
-liberty/framework/postgres/dump/libnjde.dump,sha256=2_uezKcMxKbtYvqmYi42lbVufhSRAUbKaDpaxUE867I,118368
-liberty/framework/postgres/dump/libnsx1.dump,sha256=Ea9crknNNsEYcaXPdgQUqDd20Ud3_qSyl6IasnzgShE,153089
-liberty/framework/postgres/dump/nomaarf.dump,sha256=jhc0B-zux2MiRKoJD8vc0PGGJx3OTqn8SNVVMQOjOBI,3032
-liberty/framework/postgres/dump/nomajde.dump,sha256=gySjseHHK1zukSJl1H6Lda-Rk36fF1Djm7gDYlBkdqc,10293
-liberty/framework/postgres/dump/nomasx1.dump,sha256=8s3vfEYbnHFC3jV9B5FLXwbfkxucXT1pqwvhWSQRONo,157048
+liberty/framework/postgres/dump/airflow.dump,sha256=JOZOEg2yl40EOxPDVJGPCJn-hVDVOq9KRPEQ41cq-f0,265618
+liberty/framework/postgres/dump/gitea.dump,sha256=IrO8YPsYV2jH850QdXM1KmZMxXsOTkXkNVm9_8iHlUE,341299
+liberty/framework/postgres/dump/keycloak.dump,sha256=ZpQ8CLdxKFOax_xUJciHfUKti7cSqhEh_xaWf0W4qpw,212519
+liberty/framework/postgres/dump/liberty.dump,sha256=kda9i9MwL6oZy6CjIPtEAvJ6ibBUUXb9Ur4gOaCBosw,212937
+liberty/framework/postgres/dump/libnarf.dump,sha256=LJ9wVQf5Reqqn94uTBMsuecyVwJ1Z4vw9earyxtS7Tk,129280
+liberty/framework/postgres/dump/libnjde.dump,sha256=HEa0F5JzQFGsThLaf46SLa18S4yWnZJfR72IrYbGha4,118480
+liberty/framework/postgres/dump/libnsx1.dump,sha256=uGZSLreYs2DAnMYcHOd2tDNYk26MY1mTTSh0F5NnhKo,153873
+liberty/framework/postgres/dump/nomaarf.dump,sha256=hjreknE8M3Opm2jxNsTIOkxee1vrH672rVNOpiThBR0,3032
+liberty/framework/postgres/dump/nomajde.dump,sha256=38y6LL2gDy7N4IigTIt6hZHLYWRy8VX0dDL_di_hjBg,10293
+liberty/framework/postgres/dump/nomasx1.dump,sha256=4QBpK528bsVakPG0yz8VOQOTidJoJ6RuBF7nk9W_Fwc,163041
 liberty/framework/public/__init__.py,sha256=X9OPx-1zYGkaYoqtEl8m9rj-8q74RRQkINjXdg-ZNhQ,775
-liberty/framework/public/frontend/index.html,sha256=2T8h-d_mFmVtnE1cPgNt2H7SOXb5PyofeEQVI4ZILPY,483
+liberty/framework/public/frontend/index.html,sha256=cbt6GHTv1xM3eiR5_9d-bTZBEpiqsyQTMXmRUn2KrvM,483
 liberty/framework/public/frontend/assets/background_ly-VdfFMP8a.jpg,sha256=BKIF4GdQXYGMkRADrEFgMmIdxGH6c-5HGGa84oEMFTc,4409225
-liberty/framework/public/frontend/assets/index-Cg8xUlyp.js,sha256=znOivY1vkkb2MS7MyN9j1q-6URj2Px-V2DFGg5B3V7o,3544240
-liberty/framework/public/frontend/assets/index-Cg8xUlyp.js.map,sha256=gcr8UQAg5LNQb8h4xGMZHIJQ_jXO1Dmzw8IhpflKE1Y,9845169
-liberty/framework/public/frontend/assets/index.es-CBlJRKZK-D_h9KJEz.js,sha256=MUFI0G8HR8kI0cjWqTLXhYY_bxZGMBu8OAQJHLVu--U,158417
-liberty/framework/public/frontend/assets/index.es-CBlJRKZK-D_h9KJEz.js.map,sha256=zrlwBUuKno26za_2Fsdhp_4fv9mx-BYJTIzQAwQ9o-U,462177
+liberty/framework/public/frontend/assets/index-Cs2kujxt.js,sha256=ynNAK8FcZevS8uDtv0sZ1z8GY7IAoCufU5e7xstL4gA,3544236
+liberty/framework/public/frontend/assets/index-Cs2kujxt.js.map,sha256=x1n7a8-V6lwTm1raoT5WA3OGS5_zFHL7vrDS5za5uD0,9828578
+liberty/framework/public/frontend/assets/index.es-CBlJRKZK-Cfv2J47X.js,sha256=xHG6P63eyvZkLEKPwv_APELPbudj_cKfBQxSrvZil1c,158417
+liberty/framework/public/frontend/assets/index.es-CBlJRKZK-Cfv2J47X.js.map,sha256=D9nK_4ojtZWPXWBPVbqFW7QtQFvu1oresUS2wtpKjzc,462177
 liberty/framework/public/frontend/assets/logo_ly-HGj2PB94.svg,sha256=2xnOaSTVYAYU2-ARq5iO80PsKpQveFONztGCoFHl5TU,1466
 liberty/framework/public/frontend/assets/purify.es-BGDLgQxM-VhQmH9Os.js,sha256=qgf6cOi31mrg5FlkirfsGuPkCPNL-j9_Z5tFvZ7D2f8,22071
 liberty/framework/public/frontend/assets/purify.es-BGDLgQxM-VhQmH9Os.js.map,sha256=fg8qiWodo_8pq5bv9uFqXhWZ0PB8ogcelJqb0fgzkFA,53117
@@ -73,17 +73,17 @@ liberty/framework/setup/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 liberty/framework/setup/data/__init__.py,sha256=O_sR1CffdiknRqZEek6A4RehrzaRU4PsvrRaxISTqgo,312
 liberty/framework/setup/data/liberty.json,sha256=auHN_ROY1bNhgjv0aFys9R4NepuhnvchXo3T6P7TF8w,1814212
 liberty/framework/setup/data/libnarf.json,sha256=aYrXLV_Gi6zPGMxNNjkeKt5FP1c7KDG8zaJZb3TZkk4,173598
-liberty/framework/setup/data/libnjde.json,sha256=5IsbEpV8PYS1ucnd9y1PubaoP_t3KThidvj-80Ezhm4,551604
-liberty/framework/setup/data/libnsx1.json,sha256=31CKF0SkHGww7QSQvr2Iv6sHrb7u6jA5g2RPGmBzagQ,1268911
+liberty/framework/setup/data/libnjde.json,sha256=RTZ7w3IIm4twxX4_sG8s0W2QYRMHboRuMFHwjC5-9ZU,551880
+liberty/framework/setup/data/libnsx1.json,sha256=dMtFc0yGJAWu4Je2XqtgnWQk171xWU39EyHQzLHFIp0,1281284
 liberty/framework/setup/data/nomaarf.json,sha256=yT7odhDze6nUtIMPy_1g2woWvti3l4tisjIfwXcxUf4,21
 liberty/framework/setup/data/nomasx1.json,sha256=BKlfaBj-aijbQq13Lcv2NGwGuy5ypF3QoxwwBaydooM,352058
 liberty/framework/setup/models/__init__.py,sha256=cJWsJtbU3-aFnJZ45hcEMDEThfwOyrsWI62sX2vOUFU,251
 liberty/framework/setup/models/liberty.py,sha256=UyNQQPr7M7LkNx1DH_dphZUId29_Khv4s55pC7Y8Mo8,49881
 liberty/framework/setup/models/nomaarf.py,sha256=QZDU2Eym-L1lMVb9b6u3x7RDCw9vfix1qj9G9SArI9E,2109
-liberty/framework/setup/models/nomasx1.py,sha256=ffzok0GopZjPPiREic9P0IPQ5wbSFmGlZOLFpTDbRLs,67938
+liberty/framework/setup/models/nomasx1.py,sha256=CY-7MdVUMlhTXtqbyT8LsrxiFzrZVAWQ0jyyCpfRW88,69089
 liberty/framework/setup/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 liberty/framework/setup/services/alembic.py,sha256=j7HFY4KZODMbmdL_hH19GBNQCdvDxkzz1rJMZM7Wnoc,3228
-liberty/framework/setup/services/dump.py,sha256=Gpiwau1bFYF47QrXMrT6Uttb0x-efA4Mvcb1-JviK9w,7610
+liberty/framework/setup/services/dump.py,sha256=tVJr2CqBjEosAEAEwC49bR127Jt-_qBRtPX0LaDXZc0,7631
 liberty/framework/setup/services/install.py,sha256=VMhCKfqE2IZHqPFwRFXNbbWgYaJAPQOZJJcZcdj_BVM,8835
 liberty/framework/setup/services/models.py,sha256=RzmhNu0TJCWWsbIUrsEX1aaGWifHgHzH1pY6D5KdhQY,10075
 liberty/framework/setup/services/setup.py,sha256=ki5Bo3r5TLfHAiKUxwXL_NkcYpGLTEcQMKIurQO0KHQ,24150
@@ -93,9 +93,9 @@ liberty/framework/utils/encrypt.py,sha256=SEGy8lQlqXS_bLv7DlnD-VzE-ktVrifU-YM-VU
 liberty/framework/utils/jwt.py,sha256=4k0ucr08Lh6fYNe2TXnqcuH9VWX6HGvkC2e6Q3sAnQ0,4598
 liberty/framework/utils/logs.py,sha256=OEqgQ_TS9rhWNlsesK0S-2pZCsAKip7sU5quLOMfVC8,13842
 liberty/framework/utils/test.py,sha256=SUnmWK-4MI9eeJ2DDdd83aMDd82mlFsjcY9aPXNe1nU,46520
-liberty_framework-6.0.75.dist-info/licenses/LICENSE.md,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
-liberty_framework-6.0.75.dist-info/METADATA,sha256=fGAzhMSGr3jn_kwNpD8-OTrb5J7NgRtPiWhHS1YzP0Y,8351
-liberty_framework-6.0.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-liberty_framework-6.0.75.dist-info/entry_points.txt,sha256=3urORRuOmZN-Wn52M9GwPcu4o10eOcmSrVolxpYeNJo,62
-liberty_framework-6.0.75.dist-info/top_level.txt,sha256=yLVi7QPQ0gb9dLWV2sULEDuUqws-0wVbf3sLKo0G-JQ,8
-liberty_framework-6.0.75.dist-info/RECORD,,
+liberty_framework-6.0.77.dist-info/licenses/LICENSE.md,sha256=ILBn-G3jdarm2w8oOrLmXeJNU3czuJvVhDLBASWdhM8,34522
+liberty_framework-6.0.77.dist-info/METADATA,sha256=olFq86xOmYirwXJCZ7icdOwrA6RdM4AdMQT2kp1rf2I,8351
+liberty_framework-6.0.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+liberty_framework-6.0.77.dist-info/entry_points.txt,sha256=3urORRuOmZN-Wn52M9GwPcu4o10eOcmSrVolxpYeNJo,62
+liberty_framework-6.0.77.dist-info/top_level.txt,sha256=yLVi7QPQ0gb9dLWV2sULEDuUqws-0wVbf3sLKo0G-JQ,8
+liberty_framework-6.0.77.dist-info/RECORD,,