rda-python-dbms 1.0.2__tar.gz → 1.0.4__tar.gz

{rda_python_dbms-1.0.2 → rda_python_dbms-1.0.4}/PKG-INFO

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

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dbms"
-version = "1.0.2"
+version = "1.0.4"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_dbms-1.0.2 → rda_python_dbms-1.0.4}/src/rda_python_dbms/PgDDLLib.py

@@ -693,15 +693,32 @@ def change_column_action(ptname, poname, pcname):
 #
 # action string to modify a column
 #
-def modify_column_action(ptname, pcname, column):
+def modify_column_action(ptname, pcname, column, tbname):
 
-   sqlstr = "ALTER TABLE {}".format(ptname)
-   sqlstr += "\n  ALTER COLUMN {} TYPE {}".format(pcname, column['type'])
-   if 'notnull' in column: sqlstr += ",\n  ALTER COLUMN {} SET {}".format(pcname, column['notnull'])
-   if 'default' in column: sqlstr += ",\n  ALTER COLUMN {} SET DEFAULT {}".format(pcname, column['default'])
+   sqlstr = ''
+   dft = None
+   type = column['type']
+   ms = re.match(r'^\s*(\w*)serial$', type)
+   if ms:
+      pint = ms.group(1)
+      if pint:
+         type = pint + 'int'
+      else:
+         type = 'integer'
+      sqname = f"{tbname}_{pcname}_seq"
+      sqlstr = f"CREATE SEQUENCE {sqname} OWNED BY {ptname}.{pcname};\n"
+      dft = f"nextval('{sqname}')"
+   elif 'default' in column:
+      dft = column['default']
+   sqlstr += f"ALTER TABLE {ptname}"
+   sqlstr += f"\n  ALTER COLUMN {pcname} TYPE {type}"
+   if 'notnull' in column:
+      sqlstr += f",\n  ALTER COLUMN {pcname} SET {column['notnull']}"
+   if dft: sqlstr += f",\n  ALTER COLUMN {pcname} SET DEFAULT {dft}"
    sqlstr += ";\n"
-   if 'comment' in column: sqlstr += "COMMENT ON COLUMN {}.{} IS '{}';\n".format(ptname, pcname, column['comment'])
-
+   if 'comment' in column:
+      sqlstr += f"COMMENT ON COLUMN {ptname}.{pcname} IS '{column['comment']}';\n"
+ 
    return sqlstr
 
 #
@@ -944,7 +961,7 @@ def process_tables(tablenames, act, opt, names = None):
             colname = column['name']
             pcname = PgDBI.pgname(colname)
             if names and colname not in names: continue
-            if column['type'].find('SERIAL') > -1:
+            if column['type'].find('serial') > -1:
                if names: PgLOG.pglog("{}: Cannt {} {} for SERIAL column {}".format(tbname, opt, act, colname), PgLOG.LOGWRN)
                continue
             if act == 'ADD':    # add column default
@@ -988,7 +1005,7 @@ def process_tables(tablenames, act, opt, names = None):
          if 'pkey' not in table:
             PgLOG.pglog(tbname + ": No primary key defined", PgLOG.LGEREX)
          if act == 'ADD':     # add primary key
-            sqlstr = add_pkey_action(ptname, table)
+            sqlstr = add_pkey_action(ptname, table['pkey'])
          elif act == 'DEL':   # drop primary key
             sqlstr = drop_pkey_action(ptname)
          PgDBI.pgexec(sqlstr, PgLOG.LGEREX)
@@ -1050,7 +1067,7 @@ def process_tables(tablenames, act, opt, names = None):
             elif act == 'CHG':
                sqlstr = change_column_action(ptname, poname, pcname)
             elif act == 'MOD':
-               sqlstr = modify_column_action(ptname, pcname, column)
+               sqlstr = modify_column_action(ptname, pcname, column, table['name'])
             PgDBI.pgexec(sqlstr, PgLOG.LGEREX)
             PgLOG.pglog("{}: {} {} {}".format(tbname, act, opt, colname), PgLOG.LOGWRN)
       elif opt == 'JSN':      # dump table to json

{rda_python_dbms-1.0.2 → rda_python_dbms-1.0.4}/src/rda_python_dbms/pgseq.py

@@ -22,6 +22,7 @@ from rda_python_common import PgUtil
 SINFO = {
    'ht' : 'rda-pgdb-02.ucar.edu',
    'db' : 'rdadb',
+   'pt' : 5432,
    'us' : '',
    'pw' : '',
 }
@@ -40,7 +41,7 @@ def main():
    for arg in argv:
       if arg == "-b":
          PgLOG.MYLOG['BCKGRND'] = 1
-      elif re.match(r'^-([dhpstu])$', arg):
+      elif re.match(r'^-([cdhptuw])$', arg):
          option = arg[1]
       elif re.match(r'^-', arg):
          PgLOG.pglog(arg + ": Invalid Option", PgLOG.LGWNEX)
@@ -50,10 +51,12 @@ def main():
          elif option == 'h':
             SINFO['ht'] = arg
          elif option == 'p':
+            SINFO['pt'] = int(arg)
+         elif option == 'w':
             SINFO['pw'] = arg
          elif option == 'u':
             SINFO['us'] = arg
-         elif option == 's':
+         elif option == 'c':
             scnames.append(arg)
          elif option == 't':
             tbnames.append(arg)
@@ -61,14 +64,15 @@ def main():
          PgLOG.pglog(arg + ": Passed in without leading Option", PgLOG.LGWNEX)
 
    if not scnames:
-      print("Usage: pgseq [-h HostName] [-d DatabaseName] -s SchemaNames  \\")
+      print("Usage: pgseq [-h HostName] [-d DatabaseName] -c SchemaNames  \\")
       print("             [-t TableNames] [-u UserName] [-p Password]")
       print("   -h: PostgreSQL Database server hostname, default to " + SINFO['ht'])
+      print("   -p: PostgreSQL Database server port number, default to " + str(SINFO['pt']))
       print("   -d: PostgreSQL Database name, default to " + SINFO['db'])
-      print("   -s: Reset sequences for the provided Schemas, at least provide one")
+      print("   -c: Reset sequences for the provided Schemas, at least provide one")
       print("   -t: Table names to reset sequences, default to all tables in the schema")
       print("   -u: Provide database login username if other than the schema name")
-      print("   -p: Optional database login password")
+      print("   -w: database login password")
       sys.exit(0)
 
    PgLOG.cmdlog("pgseq {}".format(' '.join(argv)))
@@ -81,7 +85,7 @@ def reset_table_sequence(scname, tbnames):
 
    us = SINFO['us'] if SINFO['us'] else scname
    pw = SINFO['pw'] if SINFO['pw'] else us
-   PgDBI.default_scinfo(SINFO['db'], scname, SINFO['ht'], us, pw)
+   PgDBI.default_scinfo(SINFO['db'], scname, SINFO['ht'], us, pw, SINFO['pt'])
    scnd = "table_catalog = '{}' AND table_schema = '{}' AND table_type = 'BASE TABLE'".format(SINFO['db'], scname)
    if tbnames:
       cnd = " AND table_name "

{rda_python_dbms-1.0.2 → rda_python_dbms-1.0.4}/src/rda_python_dbms/tables/dssdb/allusage.json

@@ -80,7 +80,7 @@
     },
     {
       "name": "region",
-      "type": "varchar(30)",
+      "type": "varchar(80)",
       "comment": "user region name; for example, Colorado"
     }
   ],

{rda_python_dbms-1.0.2 → rda_python_dbms-1.0.4}/src/rda_python_dbms/tables/dssdb/codusage.json

@@ -46,6 +46,11 @@
       "type": "varchar(5)",
       "comment": "organization type like DSS, UCAR or UNIV"
     },
+    {
+      "name": "region",
+      "type": "varchar(80)",
+      "comment": "region name, state or province"
+    },
     {
       "name": "country",
       "type": "varchar(30)",

{rda_python_dbms-1.0.2 → rda_python_dbms-1.0.4}/src/rda_python_dbms/tables/dssdb/ipinfo.json

@@ -19,7 +19,7 @@
     {
       "name": "ip",
       "type": "varchar(32)",
-      "comment": "ip aaddress"
+      "comment": "ip address"
     },
     {
       "name": "hostname",
@@ -57,6 +57,11 @@
       "type": "varchar(30)",
       "comment": "user country name"
     },
+    {
+      "name": "region",
+      "type": "varchar(80)",
+      "comment": "region name for the ip, state or province"
+    },
     {
       "name": "city",
       "type": "varchar(80)",
@@ -91,6 +96,10 @@
     {
       "name": "ipinfo_idx_3",
       "column": "stat_flag"
+    },
+    {
+      "name": "ipinfo_idx_4",
+      "column": "hostname"
     }
   ],
   "comment": "IP ADDRESS INFORMATION"

{rda_python_dbms-1.0.2 → rda_python_dbms-1.0.4}/src/rda_python_dbms/tables/dssdb/tdsusage.json

@@ -23,6 +23,11 @@
       "type": "varchar(30)",
       "comment": "user country name"
     },
+    {
+      "name": "region",
+      "type": "varchar(80)",
+      "comment": "region name, state or province"
+    },
     {
       "name": "dsid",
       "type": "varchar(9)",

{rda_python_dbms-1.0.2 → rda_python_dbms-1.0.4}/src/rda_python_dbms/tables/dssdb/wuser.json

@@ -78,6 +78,11 @@
       "type": "varchar(128)",
       "comment": "name of the organization"
     },
+    {
+      "name": "region",
+      "type": "varchar(80)",
+      "comment": "region name, state or province"
+    },
     {
       "name": "country",
       "type": "varchar(30)",

{rda_python_dbms-1.0.2 → rda_python_dbms-1.0.4}/src/rda_python_dbms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dbms
-Version: 1.0.2
+Version: 1.0.4
 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