rda-python-dbms 2.0.7__py3-none-any.whl → 2.0.9__py3-none-any.whl

rda_python_dbms/pgbackup.py

@@ -50,7 +50,7 @@ class PgBackup(PgFile):
             elif option == 'o':
                self.override = True
             else:
-               self.pglog("{}: unknow option".format(arg), self.LGEREX)
+               self.pglog("{}: unknown option".format(arg), self.LGEREX)
       self.cmdlog("pgbackup {}".format(' '.join(argv)))
    
    # start actions

rda_python_dbms/pgdbdump.py

@@ -12,7 +12,7 @@ import sys
 import re
 import os
 from os import path as op
-from rda_python_common.pg_Util import PgUtil
+from rda_python_common.pg_util import PgUtil
 
 class PgDBDump(PgUtil):
    def __init__(self):
@@ -23,58 +23,80 @@ class PgDBDump(PgUtil):
       self.SNDACT = self.LOGWRN|self.SNDEML
       self.pname = self.hname = self.dname = None
 
-   # function to read_parameters
    def read_parameters(self):
-      # check command line for options
+      """
+      Parse command-line options and set instance variables.
+      Usage: pgdbdump [-b] -d DBNAME -h HostName [-p LocalPath]
+      """
       self.PGLOG['LOGFILE'] = "pgbackup.log"   # set log file
       argv = sys.argv[1:]
       option = None
       options = ['b', 'd', 'h', 'p']
-      for arg in argv:
+      i = 0
+      while i < len(argv):
+         arg = argv[i]
          ms = re.match(r'^-(\w)$', arg)
          if ms:
             option = ms.group(1)
-            if option not in options: self.pglog("{}: unknow option".format(arg), self.LGEREX)
-            if option == 'b': self.PGLOG['BCKGRND'] = 1
-         elif option == 'd':
-            self.dname = arg
-         elif option  == 'h':
-            self.hname = arg
-         elif option  == 'p':
-            self.pname = arg
+            if option not in options:
+               self.pglog(f"{arg}: unknown option", self.LGEREX)
+            if option == 'b':
+               self.PGLOG['BCKGRND'] = 1
+               option = None
+               i += 1
+               continue
+            # For options that require a value
+            if i + 1 >= len(argv):
+               self.pglog(f"Option -{option} requires a value", self.LGEREX)
+            val = argv[i+1]
+            if option == 'd':
+               self.dname = val
+            elif option == 'h':
+               self.hname = val
+            elif option == 'p':
+               self.pname = val
+            i += 2
+            option = None
+         else:
+            i += 1
       if not (self.dname and self.hname):
          print("Usage: pgdbdump [-b] -d DBNAME -h HostName [-p LocalPath]")
          print("  -b - background process and no screen output")
          print("  -d - PostgreSQL database name to dump at the current directory")
          print("  -h - Hostname the PostgreSQL server is running on")
          print("  -p - Local relative path to dump the database, defaults to <DBNAME>_backup_<TODAY>")
-         sys.exit(0)
+         sys.exit(1)
       self.cmdlog("pgdbdump {}".format(' '.join(argv)))
-      if not self.pname: self.pname = "{}_backup_{}".format(self.dname, self.curdate())
+      if not self.pname:
+         short_host = self.hname.split('.')[0] if self.hname else 'host'
+         today = self.curdate()
+         self.pname = f"{short_host}_{self.dname}_{today}"
 
-   # function to start_actions
    def start_actions(self):
+      """Perform the database dump and log actions."""
       self.pg_database_dbdump()
-      title = "pgdbdump: {}:{}".format(self.hname, self.dname, self.pname)
-      tmsg = "{} to {} under {}!".format(title, self.pname, os.getcwd())
+      title = f"pgdbdump: {self.hname}:{self.dname}:{self.pname}"
+      tmsg = f"{title} to {self.pname} under {os.getcwd()}!"
       self.set_email(tmsg, self.EMLTOP)
       self.pglog(title, self.SNDACT)
-      self.cmdlog()   
+      self.cmdlog()
 
-   #  bacup one database
    def pg_database_dbdump(self):
-      cmd = "pg_dump {} -h {} -U {} -w -Fd -j 16 -f {}/".format(self.dname, self.hname, self.USNAME, self.pname)
+      """Run pg_dump for the specified database and handle errors."""
+      cmd = f"pg_dump {self.dname} -h {self.hname} -U {self.USNAME} -w -Fd -j 16 -f {self.pname}/"
       if op.exists(self.pname):
-         self.pglog(self.pname + ": Dumping directory exists, remove it", self.ERRACT)
-      elif not self.pgsystem(cmd, self.LOGACT, 257):
-         self.pglog("{}: Error dumping database\n{}".format(self.dname, self.PGLOG['SYSERR']), self.ERRACT)
+         self.pglog(self.pname + ": Dumping directory exists, aborting to avoid overwrite.", self.ERRACT)
+         sys.exit(2)
+      if not self.pgsystem(cmd, self.LOGACT, 257):
+         self.pglog(f"{self.dname}: Error dumping database\n{self.PGLOG['SYSERR']}", self.ERRACT)
+         sys.exit(3)
 
-# main function to excecute this script
+# main function to execute this script
 def main():
-   object = PgDBDump()
-   object.read_parameters()
-   object.start_actions()
-   object.pgexit(0)
+   pgdb = PgDBDump()
+   pgdb.read_parameters()
+   pgdb.start_actions()
+   pgdb.pgexit(0)
 
 # call main() to start program
-if __name__ == "__main__": main()
+if __name__ == "__main__": main()

rda_python_dbms/pgdbrestore.py

@@ -35,7 +35,7 @@ class PgDBRestore(PgDBI):
          ms = re.match(r'^-(\w)$', arg)
          if ms:
             option = ms.group(1)
-            if option not in options: self.pglog("{}: unknow option".format(arg), self.LGEREX)
+            if option not in options: self.pglog("{}: unknown option".format(arg), self.LGEREX)
             if option == 'b': self.PGLOG['BCKGRND'] = 1
          elif option == 'd':
             self.dname = arg
@@ -61,7 +61,7 @@ class PgDBRestore(PgDBI):
       self.pglog(title, self.SNDACT)
       self.cmdlog()   
 
-   #  bacup one database
+   #  restore one database
    def pg_database_dbrestore(self):
       cmd = "pg_restore -d {} -h {} -U {} -w -j 16 -Fd {}".format(self.dname, self.hname, self.USNAME, self.pname)
       if not op.exists(self.pname):
@@ -69,7 +69,7 @@ class PgDBRestore(PgDBI):
       elif not self.pgsystem(cmd, self.LOGACT, 257):
          self.pglog("{}: Error restoring database\n{}".format(self.dname, self.PGLOG['SYSERR']), self.ERRACT)
 
-# main function to excecute this script
+# main function to execute this script
 def main():
    object = PgDBRestore()
    object.read_parameters()

rda_python_dbms/tables/dssdb/dsgroup.json

@@ -30,7 +30,7 @@
     },
     {
       "name": "grpid",
-      "type": "varchar(40)",
+      "type": "varchar(128)",
       "comment": "group id to identify a group"
     },
     {

{rda_python_dbms-2.0.7.dist-info → rda_python_dbms-2.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dbms
-Version: 2.0.7
+Version: 2.0.9
 Summary: RDA Python Package to manage PostreSQL databases
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dbms

{rda_python_dbms-2.0.7.dist-info → rda_python_dbms-2.0.9.dist-info}/RECORD

@@ -9,11 +9,11 @@ rda_python_dbms/pg_ddl.py,sha256=77Cil6eBKf5S5g7yWcN9m5dLZlpY3_USFQBKcaP4fiU,544
 rda_python_dbms/pg_ddllib.py,sha256=-zawllfUCe7QZNvza-u5TAYKP4yilC9K6TetHhoGenU,44265
 rda_python_dbms/pg_schema.py,sha256=Vsf5fKENYIOgMKE3yS0TkXhg-aeHZ2nYzpvltFAcdFY,5520
 rda_python_dbms/pg_seq.py,sha256=wNxqsyIjcTplJErPirZ-VkZ8HS4mgQUwPz8Xwd12kYA,4914
-rda_python_dbms/pgbackup.py,sha256=8LaRE7SeRT1hq0_oUby9lcjHSjKZI0YC_jXqtT5LNRo,4248
+rda_python_dbms/pgbackup.py,sha256=IuP3nQEEVR86YlSZuGyqsdz1-O9rgET76FnWB7iL3xk,4249
 rda_python_dbms/pgchksum.py,sha256=8jfBncptxp57Gr2t66Kk9MFt5Z_aXfozOGZPaohKGwM,21802
 rda_python_dbms/pgcmptables.py,sha256=LQ4KK4JuQs2z3nBdINWYgyiGu2MF9RZjS5_cAktbs6k,47123
-rda_python_dbms/pgdbdump.py,sha256=vM-J3VfEDTXD97OV0Ke3BJzNiXxuMQS0Ut1SxkqujkU,3170
-rda_python_dbms/pgdbrestore.py,sha256=aL1cfUQcNFlLCHBCGP3FPRc8biJfTxftq9lm_Ou8KHA,3108
+rda_python_dbms/pgdbdump.py,sha256=8d-1z16Y2DyJnQqex2wFu5svChKgncPnzdQ-iUftHg8,3831
+rda_python_dbms/pgdbrestore.py,sha256=d12hl1r6usK1oGIFAPVWUB_KkIH04PPlugxVSnLOX1g,3110
 rda_python_dbms/pgddl.py,sha256=kHTtWzetAwaS8GEG9x8KBLwW-RqMJ-2cbGDlYtJOSH8,6198
 rda_python_dbms/pgddl.usg,sha256=7ly6YbusvyIy9yQn9reGIUtZQ5Wiehp9-DKDgfjqSBE,2267
 rda_python_dbms/pgschema.py,sha256=ZLkRy2vgfkRYWQ95bGXkz13n5LR5wrdki6WV5ZA8eL0,6293
@@ -61,7 +61,7 @@ rda_python_dbms/tables/dssdb/dscart.json,sha256=ggVt5SVi1EbNc9bEA7dCRRF4l7pOZIHm
 rda_python_dbms/tables/dssdb/dscheck.json,sha256=ZL6VNerF2PGcP0yPFUXhq7dzJDc5g5xX64eURAghGNY,6426
 rda_python_dbms/tables/dssdb/dschkhist.json,sha256=UeTjTsIpBGGscPNajL1tl7uflQWbYe3ILkyBcDBb9Mc,2880
 rda_python_dbms/tables/dssdb/dsdaemon.json,sha256=Ua0TktcZ5RPEQbwEblnNjWRBjDp-xcuunsaCAIaXsx0,1859
-rda_python_dbms/tables/dssdb/dsgroup.json,sha256=nIYLZhK-ru8zmC6fxqqzl9XhPjf3xL9kxUt9dwpFGNs,5388
+rda_python_dbms/tables/dssdb/dsgroup.json,sha256=aZ7RtRWnRcIruQesdsbUglHxvb8tROfNoWMNP0Bfzdk,5389
 rda_python_dbms/tables/dssdb/dshist.json,sha256=EEpCLLwS0vfV9OwMWgrRmvHP81gMybG8NOTxtDeHR1Y,1396
 rda_python_dbms/tables/dssdb/dslimit.json,sha256=hdpRAC4Bg0ZUCwVVDCCHVwYJcDLotXFB2e30G7ByzKg,758
 rda_python_dbms/tables/dssdb/dsokeys.json,sha256=4c_AsQgxBApawhnkKTzXflxL-603J19z8poimxe_sXw,746
@@ -954,9 +954,9 @@ rda_python_dbms/tables/obsua/wind_5v2_0.json,sha256=NehMFE-GMNlD5Bh_fiacfSOmZWkr
 rda_python_dbms/tables/obsua/wind_60v2_0.json,sha256=jOyQgD5ph7YBMuQfvYz1Ln6X_-_Vdhl36HBexOHZ1dA,1067
 rda_python_dbms/tables/obsua/wind_8v2_0.json,sha256=5wtCThmFeOyiAGH_Qv3_jrXjhjo9b87ehlpI9QQY2SM,1064
 rda_python_dbms/tables/obsua/wind_9v2_0.json,sha256=7OKFUicOn15LL_WuF1VE_L8DjxsHmRP4uBnopuMIeTg,1064
-rda_python_dbms-2.0.7.dist-info/licenses/LICENSE,sha256=Uky6fiiVw7cakFVRtVpzg-mvqOQ-WcA_H8lHqhPRg58,1101
-rda_python_dbms-2.0.7.dist-info/METADATA,sha256=Rs9LOGe7lwIOFKICQ6HA79ndm_mu_5d73Z_MuyUQoMg,617
-rda_python_dbms-2.0.7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-rda_python_dbms-2.0.7.dist-info/entry_points.txt,sha256=iti6iZS2OEeBqO5aHlWeMFcbuwN_2assidP0qeSkQ6E,346
-rda_python_dbms-2.0.7.dist-info/top_level.txt,sha256=4T1ShNUMyiqmwDIuDL7pDOm_S-6zWWW3Vy6OdAzYA4c,16
-rda_python_dbms-2.0.7.dist-info/RECORD,,
+rda_python_dbms-2.0.9.dist-info/licenses/LICENSE,sha256=Uky6fiiVw7cakFVRtVpzg-mvqOQ-WcA_H8lHqhPRg58,1101
+rda_python_dbms-2.0.9.dist-info/METADATA,sha256=8jhKTRIo91_CXYgIdyMBwXbCZQ1VOpS-1ghgC6NxVbI,617
+rda_python_dbms-2.0.9.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rda_python_dbms-2.0.9.dist-info/entry_points.txt,sha256=iti6iZS2OEeBqO5aHlWeMFcbuwN_2assidP0qeSkQ6E,346
+rda_python_dbms-2.0.9.dist-info/top_level.txt,sha256=4T1ShNUMyiqmwDIuDL7pDOm_S-6zWWW3Vy6OdAzYA4c,16
+rda_python_dbms-2.0.9.dist-info/RECORD,,