Commits

Kirill Simonov  committed e852d7f

Added ORACLE_* and MSSQL_* variables to the makefile.

  • Participants
  • Parent commits 1d2b675

Comments (0)

Files changed (3)

 build
 external
 static/htraf
+Makefile.env

File Makefile.common

 
 ORACLE_ADMIN_USERNAME?=system
 ORACLE_ADMIN_PASSWORD?=
-ORACLE_HOST?=
-ORACLE_PORT?=
+ORACLE_HOST?=localhost
+ORACLE_PORT?=1521
 ORACLE_USERNAME?=htsql_regress
 ORACLE_PASSWORD?=secret
 ORACLE_SID?=htsql_regress
 
 MSSQL_ADMIN_USERNAME?=sa
 MSSQL_ADMIN_PASSWORD?=
-MSSQL_HOST?=
-MSSQL_PORT?=
+MSSQL_HOST?=localhost
+MSSQL_PORT?=1433
 MSSQL_USERNAME?=htsql_regress
 MSSQL_PASSWORD?=secret
 MSSQL_DATABASE?=htsql_regress

File Makefile.env.sample

 # The name of the regression database.
 #PGSQL_DATABASE?=htsql_regress
 
-# The commands to start and to stop the database server.
-# FIXME: currently unused.
-#PGSQL_START?=
-#PGSQL_STOP?=
-
 
 #
 # MySQL configuration
 # The name of the regression database.
 #MYSQL_DATABASE?=htsql_regress
 
-# The commands to start and to stop the database server.
-# FIXME: currently unused.
-#MYSQL_START?=
-#MYSQL_STOP?=
 
+#
+# Oracle configuration
+#
 
+# Running regression tests for Oracle creates a user "htsql_regress".
+
+# The database user than can create and drop databases.
+#ORACLE_ADMIN_USERNAME?=system
+#ORACLE_ADMIN_PASSWORD?=
+
+# The address of the database server.
+#ORACLE_HOST?=localhost
+#ORACLE_PORT?=1521
+
+# The database user created by the regression tests.
+#ORACLE_USERNAME?=htsql_regress
+#ORACLE_PASSWORD?=secret
+
+# System ID of the database.
+#ORACLE_SID?=XE
+
+
+#
+# MS SQL Server configuration
+#
+
+# Running regression tests for MS SQL Server creates a database "htsql_regress"
+# and a user with the same name.
+
+# The database user than can create and drop databases.
+#MSSQL_ADMIN_USERNAME?=sa
+#MSSQL_ADMIN_PASSWORD?=
+
+# The address of the database server.
+#MSSQL_HOST?=localhost
+#MSSQL_PORT?=1433
+
+# The database user created by the regression tests.
+#MSSQL_USERNAME?=htsql_regress
+#MSSQL_PASSWORD?=secret
+
+# The name of the regression database.
+#MSSQL_DATABASE?=htsql_regress
+
+