rda-python-dbms 1.0.24__tar.gz → 1.0.26__tar.gz

{rda_python_dbms-1.0.24 → rda_python_dbms-1.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dbms
-Version: 1.0.24
+Version: 1.0.26
 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-1.0.24 → rda_python_dbms-1.0.26}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dbms"
-version = "1.0.24"
+version = "1.0.26"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]
@@ -34,3 +34,4 @@ pgdbdump = "rda_python_dbms.pgdbdump:main"
 pgdbrestore = "rda_python_dbms.pgdbrestore:main"
 pgchksum = "rda_python_dbms.pgchksum:main"
 pgcmptables = "rda_python_dbms.pgcmptables:main"
+pgschema = "rda_python_dbms.pgschema:main"

rda_python_dbms-1.0.26/src/rda_python_dbms/pgschema.py

@@ -0,0 +1,168 @@
+#!/usr/bin/env python3
+#
+##################################################################################
+#
+#     Title : pgschema
+#    Author : Zaihua Ji, zji@ucar.edu
+#      Date : 2025-09-27
+#   Purpose : copy tables of a schema to teh same schema name in a different database
+#             on the same server
+#
+#    Github : https://github.com/NCAR/rda-python-dbms.git
+#
+##################################################################################
+
+import sys
+import os
+import re
+from os import path as op
+from time import time as tm
+from rda_python_common import PgLOG
+from rda_python_common import PgDBI
+from rda_python_common import PgSIG
+from rda_python_common import PgUtil
+
+PVALS = {
+   'db' : 'rdadb',
+   'nd' : None,
+   'sc' : None,
+   'us' : None,
+   'ht' : 'rda-db.ucar.edu',
+   'mp' : 16,      # number of concurrent processes (one for a table at a time)
+   'pn' : 5432,
+   'tb' : []
+}
+
+#
+# main function to run dsarch
+#
+def main():
+
+   argv = sys.argv[1:]
+   opt = None
+   for arg in argv:
+      if re.match(r'-(\w+)$', arg):
+         opt = arg[1:]
+         if opt == "b":
+            PgLOG.PGLOG['BCKGRND'] = 1
+            opt = None
+         elif opt not in PVALS:
+            PgLOG.pglog(arg + ": Invalid Option", PgLOG.LGWNEX)
+      elif opt:
+         if isinstance(PVALS[opt], list):
+            PVALS[opt].append(arg)
+         elif isinstance(PVALS[opt], int):
+            PVALS[opt] = int(arg)
+            opt = None
+         else:
+            PVALS[opt] = arg
+            opt = None
+      else:
+         PgLOG.pglog(arg + ": parameter misses leading option", PgLOG.LGWNEX)
+   
+   PgLOG.PGLOG['LOGFILE'] = "pgschema.log"
+   sc = PVALS['sc']
+
+   if not sc:
+      print("Dump all or specified tables in a Schema in the current directory; Restore")
+      print("the dumped schema to a different Database name with the same schema name.")
+      print("Existing tables in the target database.schema will not be overriden. If the")
+      print("target schema exists already, try to login to the new database to drop the")
+      print("schema: 'drop schema SchemaName cascade;', for a fresh new schema stransfer.")
+      print("Usage:\npgschema [-b] [-m PMAX] [-ht HOSTNAME] [-db DATABASE] -sc SCHEMA  \\")
+      print("      [-nd NEWDATABASE] [-us USERNAME] [-tb TABLES] [-pn PORTNO]")
+      print("  Option -tb - specify the table names, use wildcard '*' to match mutiple tables")
+      print("  Option -ht - host name of database server is running on; default to 'rda-db.ucar.edu'")
+      print("  Option -sc - the schema for tables to be transferred from")
+      print("  Option -db - the database name, default to 'rdadb'")
+      print("  Option -nd - the new database for schema to be transferred to; defaults to <DATABASE>_test")
+      print("  Option -us - specify the user name, default to -sc")
+      print("  Option -pn - the port number to connect to database, default to 5432")
+      print("  Option -mp - the number of processes to dump/restore schema; default to 16")
+      print("NOTE: To transfer schema, set both database password entries in file .pgpass")
+      print("      under your home directory as HOSTNAME:5432:DATABASE:USERNAME:password.")
+      print("For Example to transfer schema wagtail in Dababase rdadb to Database rdadb_test:")
+      print("      rda-db.ucar.edu:5432:rdadb:wagtail:<WagtailPassword>")
+      print("      rda-db.ucar.edu:5432:rdadb_test:wagtail:<WagtailPassword>")
+      sys.exit(0)
+
+   if not PVALS['us']: PVALS['us'] = sc
+   if not PVALS['nd']: PVALS['nd'] = f"{PVALS['db']}_test"
+   if PVALS['nd'] == PVALS['db']:
+      PgLOG.pglog(f"Must transfer schema {sc} to a Database other than {PVALS['db']}", PgLOG.LGWNEX)
+
+   PgLOG.cmdlog("pgschema {}".format(' '.join(argv)))
+   PVALS['pgsc'] = PgDBI.pgname(sc)
+   transfer_schema(sc, PVALS['tb'])
+   PgLOG.cmdlog()
+   sys.exit(0)
+
+#
+# transfer a schema from one database to another
+#
+def transfer_schema(sc, tables):
+
+   db = PVALS['db']
+   nd = PVALS['nd']
+
+   topt = get_table_options(tables)
+   # dump schema
+   dumpdir = "{}_dump_{}".format(sc, PgUtil.curdate())
+   if op.exists(dumpdir):
+      PgLOG.pglog(dumpdir + ": Local directory exists, remove it before running pgschema", PgLOG.LGEREX)
+
+   pgsc = PVALS['pgsc']
+   dbsc = f"{db}.{sc}: "
+   tstr = f"\nFor tables in '{tables}'" if tables else ""
+   if pgsc != sc: pgsc = "'{}'".format(pgsc)
+   cmd = f"pg_dump {db} -h {PVALS['ht']} -n {pgsc}{topt} -U {PVALS['us']} -w -Fd -j {PVALS['mp']} -f {dumpdir}/"
+   if PgLOG.pgsystem(cmd, PgLOG.LOGWRN, 4):   # 4 + 1
+      msg = f"Schema dumped in {dumpdir}"
+      logact = PgLOG.LOGWRN
+   else:
+      msg = "Error dumping schema"
+      logact = PgLOG.LGEREX
+   PgLOG.pglog(dbsc + msg + tstr, logact)
+
+   # restore schema
+   pgsc = PVALS['pgsc']
+   dbsc = f"{nd}.{sc}: "
+   cmd = f"psql {nd} -h {PVALS['ht']} -U {PVALS['us']} -c 'CREATE SCHEMA IF NOT EXISTS {pgsc}'"
+   if PgLOG.pgsystem(cmd, PgLOG.LOGWRN, 4):
+      msg = "Schema Created"
+      logact = PgLOG.LOGWRN
+   else:
+      msg = "Error creating schema"
+      logact = PgLOG.LGEREX
+   PgLOG.pglog(dbsc + msg + tstr, logact)
+   cmd = f"pg_restore -d {nd} -h {PVALS['ht']}{topt} -U {PVALS['us']} -w -j {PVALS['mp']} -Fd {dumpdir}"
+   if not PgLOG.pgsystem(cmd, PgLOG.LOGWRN, 5):
+      msg = f"Schema Restored from {dumpdir}"
+      logact = PgLOG.LOGWRN
+   else:
+      msg = "Error restoring schema"
+      logact = PgLOG.LGEREX
+   PgLOG.pglog(dbsc + msg + tstr, logact)
+
+   # remove dumped directory
+   cmd = f"rm -rf {dumpdir}"
+   if PgLOG.pgsystem(cmd, PgLOG.LOGWRN, 4):
+      msg = "Directory removed"
+      logact = PgLOG.LOGWRN
+   else:
+      msg = "Error removing directory"
+      logact = PgLOG.LGEREX
+   PgLOG.pglog(f"{dumpdir}: {msg}", logact)
+
+
+def get_table_options(tables):
+
+   tstr = ''
+   for tb in tables: tstr += " -t {}".format(PgDBI.pgname(tb))
+   
+   return tstr
+
+#
+# call main() to start program
+#
+if __name__ == "__main__": main()

{rda_python_dbms-1.0.24 → rda_python_dbms-1.0.26}/src/rda_python_dbms/tables/dssdb/dscheck.json

@@ -152,8 +152,8 @@
     {
       "name": "pbsqueue",
       "type": "char(3)",
-      "default": "'rda'",
-      "comment": "Queue (rda or htc) used for the PBS batch job"
+      "default": "'gdex'",
+      "comment": "Queue (gdex or htc) used for the PBS batch job"
     },
     {
       "name": "bid",

{rda_python_dbms-1.0.24 → rda_python_dbms-1.0.26}/src/rda_python_dbms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dbms
-Version: 1.0.24
+Version: 1.0.26
 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-1.0.24 → rda_python_dbms-1.0.26}/src/rda_python_dbms.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ src/rda_python_dbms/pgdbdump.py
 src/rda_python_dbms/pgdbrestore.py
 src/rda_python_dbms/pgddl.py
 src/rda_python_dbms/pgddl.usg
+src/rda_python_dbms/pgschema.py
 src/rda_python_dbms/pgseq.py
 src/rda_python_dbms.egg-info/PKG-INFO
 src/rda_python_dbms.egg-info/SOURCES.txt

{rda_python_dbms-1.0.24 → rda_python_dbms-1.0.26}/src/rda_python_dbms.egg-info/entry_points.txt

@@ -5,4 +5,5 @@ pgcmptables = rda_python_dbms.pgcmptables:main
 pgdbdump = rda_python_dbms.pgdbdump:main
 pgdbrestore = rda_python_dbms.pgdbrestore:main
 pgddl = rda_python_dbms.pgddl:main
+pgschema = rda_python_dbms.pgschema:main
 pgseq = rda_python_dbms.pgseq:main