Merge pull request IvorySQL#940 from OreoYang/master

Master branch: add display ivorysql version in psql welcome banner and select().

Author: gaoxueyu

configure

@@ -19618,9 +19618,15 @@ else
   cc_string=$CC
 fi
 
+# IvorySQL version
+PACKAGE_IVORYSQL_VERSION='5beta1'
 
 cat >>confdefs.h <<_ACEOF
-#define PG_VERSION_STR "PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"
+#define PACKAGE_IVORYSQL_VERSION "$PACKAGE_IVORYSQL_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PG_VERSION_STR "PostgreSQL $PG_VERSION (IvorySQL $PACKAGE_IVORYSQL_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"
 _ACEOF
 
 

configure.ac

@@ -24,18 +24,23 @@ Untested combinations of 'autoconf' and PostgreSQL versions are not
 recommended.  You can remove the check from 'configure.ac' but it is then
 your responsibility whether the result works or not.])])
 AC_COPYRIGHT([Copyright (c) 1996-2025, PostgreSQL Global Development Group])
+AC_COPYRIGHT([Portions Copyright (c), 2023-2025, IvorySQL Global Development Team])
 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
 AC_CONFIG_AUX_DIR(config)
 AC_PREFIX_DEFAULT(/usr/local/pgsql)
 AC_DEFINE_UNQUOTED(CONFIGURE_ARGS, ["$ac_configure_args"], [Saved arguments from configure])
 
+# IvorySQL version
+PACKAGE_IVORYSQL_VERSION='5beta1'
+
 [PG_MAJORVERSION=`expr "$PACKAGE_VERSION" : '\([0-9][0-9]*\)'`]
 [PG_MINORVERSION=`expr "$PACKAGE_VERSION" : '.*\.\([0-9][0-9]*\)'`]
 test -n "$PG_MINORVERSION" || PG_MINORVERSION=0
 AC_SUBST(PG_MAJORVERSION)
 AC_DEFINE_UNQUOTED(PG_MAJORVERSION, "$PG_MAJORVERSION", [PostgreSQL major version as a string])
 AC_DEFINE_UNQUOTED(PG_MAJORVERSION_NUM, $PG_MAJORVERSION, [PostgreSQL major version number])
 AC_DEFINE_UNQUOTED(PG_MINORVERSION_NUM, $PG_MINORVERSION, [PostgreSQL minor version number])
+AC_DEFINE_UNQUOTED([PACKAGE_IVORYSQL_VERSION], "$PACKAGE_IVORYSQL_VERSION" , [IvorySQL version number])
 
 PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
              [PG_VERSION="$PACKAGE_VERSION$withval"],
@@ -2543,7 +2548,7 @@ else
 fi
 
 AC_DEFINE_UNQUOTED(PG_VERSION_STR,
-                   ["PostgreSQL $PG_VERSION on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
+                   ["PostgreSQL $PG_VERSION (IvorySQL $PACKAGE_IVORYSQL_VERSION) on $host, compiled by $cc_string, `expr $ac_cv_sizeof_void_p \* 8`-bit"],
                    [A string containing the version number, platform, and C compiler])
 
 # Supply a numeric version string for use by 3rd party add-ons

meson.build

@@ -28,7 +28,7 @@ project('postgresql',
 )
 
 # IvorySQL version
-ivorysql_version = '5.0'
+ivorysql_version = '5beta1'
 
 
 ###############################################################
@@ -155,7 +155,7 @@ cdata.set('PG_MAJORVERSION_NUM', pg_version_major)
 cdata.set('PG_MINORVERSION_NUM', pg_version_minor)
 cdata.set('PG_VERSION_NUM', pg_version_num)
 
-cdata.set('PACKAGE_IVORYSQL_VERSION', ivorysql_version)
+cdata.set_quoted('PACKAGE_IVORYSQL_VERSION', ivorysql_version)
 # PG_VERSION_STR is built later, it depends on compiler test results
 cdata.set_quoted('CONFIGURE_ARGS', '')
 
@@ -2979,7 +2979,7 @@ cdata.set_quoted('DLSUFFIX', dlsuffix)
 cdata.set_quoted('PG_VERSION_STR',
   'PostgreSQL (IvorySQL @6@) @0@ on @1@-@2@, compiled by @3@-@4@, @5@-bit'.format(
     pg_version, host_machine.cpu_family(), host_system,
-    cc.get_id(), cc.version(), cdata.get('SIZEOF_VOID_P') * 8, cdata.get('PACKAGE_IVORYSQL_VERSION')
+    cc.get_id(), cc.version(), cdata.get('SIZEOF_VOID_P') * 8, ivorysql_version
   )
 )
 

src/bin/psql/command.c

@@ -42,7 +42,7 @@
 #include "mainloop.h"
 #include "pqexpbuffer.h"
 #include "psqlscanslash.h"
-#include "ora_psqlscanslash.h" 
+#include "ora_psqlscanslash.h"
 #include "settings.h"
 #include "variables.h"
 
@@ -294,7 +294,7 @@ HandleSlashCmds(PsqlScanState scan_state,
 	/* if there is a trailing \\, swallow it */
 	if (db_mode == DB_PG)
 		psql_scan_slash_command_end(scan_state);
-	else if(db_mode == DB_ORACLE)
+	else if (db_mode == DB_ORACLE)
 		ora_psql_scan_slash_command_end(scan_state);
 
 	free(cmd);
@@ -1038,6 +1038,7 @@ exec_command_d(PsqlScanState scan_state, bool active_branch, const char *cmd)
 		show_system = strchr(cmd, 'S') ? true : false;
 
 		getDbCompatibleMode(pset.db);
+
 		/*
 		 * The 'x' option turns expanded mode on for this command only. This
 		 * is allowed in all \d* commands, except \d by itself, since \dx is a
@@ -3538,6 +3539,7 @@ static backslashResult
 exec_command_parser(PsqlScanState scan_state, bool active_branch)
 {
 	bool		success = true;
+
 	if (active_branch)
 	{
 		getDbCompatibleMode(pset.db);
@@ -5191,7 +5193,7 @@ do_pset(const char *param, const char *value, printQueryOpt *popt, bool quiet)
 	/* header line width in expanded mode */
 	else if (strcmp(param, "xheader_width") == 0)
 	{
-		if (! value)
+		if (!value)
 			;
 		else if (pg_strcasecmp(value, "full") == 0)
 			popt->topt.expanded_header_width_type = PRINT_XHEADER_FULL;
@@ -5743,15 +5745,16 @@ pset_value_string(const char *param, printQueryOpt *popt)
 	else if (strcmp(param, "xheader_width") == 0)
 	{
 		if (popt->topt.expanded_header_width_type == PRINT_XHEADER_FULL)
-			return(pstrdup("full"));
+			return (pstrdup("full"));
 		else if (popt->topt.expanded_header_width_type == PRINT_XHEADER_COLUMN)
-			return(pstrdup("column"));
+			return (pstrdup("column"));
 		else if (popt->topt.expanded_header_width_type == PRINT_XHEADER_PAGE)
-			return(pstrdup("page"));
+			return (pstrdup("page"));
 		else
 		{
 			/* must be PRINT_XHEADER_EXACT_WIDTH */
-			char wbuff[32];
+			char		wbuff[32];
+
 			snprintf(wbuff, sizeof(wbuff), "%d",
 					 popt->topt.expanded_header_exact_width);
 			return pstrdup(wbuff);

src/include/pg_config.h.in

@@ -627,6 +627,9 @@
 /* PostgreSQL version as a number */
 #undef PG_VERSION_NUM
 
+/*IvorySQL version as a string*/
+#undef PACKAGE_IVORYSQL_VERSION
+
 /* A string containing the version number, platform, and C compiler */
 #undef PG_VERSION_STR