* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */
Info
Revision:3311
Author:victor
Date:2008-06-17 15:31:53 +0300 (Tue, 17 Jun 2008)
Comment:Database-specific defines moved to separate file
Changes
U trunk/sql/Makefile.am
U trunk/sql/Makefile.msvc.w32
U trunk/sql/Makefile.w32
A trunk/sql/database.in
U trunk/sql/dbinit.in
Diff
Modified: trunk/sql/Makefile.am
===================================================================
--- trunk/sql/Makefile.am 2008-06-17 11:33:16 UTC (rev 3310)
+++ trunk/sql/Makefile.am 2008-06-17 12:31:53 UTC (rev 3311)
@@ -7,7 +7,7 @@
sql_DATA = dbinit_mysql.sql dbinit_pgsql.sql dbinit_mssql.sql dbinit_oracle.sql dbinit_sqlite.sql
ROOT_FILE = dbinit.in
-SOURCE = $(ROOT_FILE) schema.in setup.in events.in images.in policy.in objtools.in scripts.in maps.in
+SOURCE = $(ROOT_FILE) database.in schema.in setup.in events.in images.in policy.in objtools.in scripts.in maps.in
HEADER_FILES = ../include/netxmsdb.h ../include/nxevent.h ../include/nximage.h ../src/server/include/nms_locks.h
COMMAND = $(CPP) -x c -P -Wundef -D_NETXMS_DB_SCHEMA_ -I_at_top_srcdir@/include -I_at_top_srcdir@/src/server/include
SQUEEZE = perl -n -e "if (! /^[\s\t\n]*$$/) { print; }"
@@ -34,5 +34,5 @@
EXTRA_DIST = \
$(sql_DATA) \
- dbinit.in events.in images.in \
+ dbinit.in database.in events.in images.in \
policy.in schema.in setup.in traps.in objtools.in scripts.in maps.in
Modified: trunk/sql/Makefile.msvc.w32
===================================================================
--- trunk/sql/Makefile.msvc.w32 2008-06-17 11:33:16 UTC (rev 3310)
+++ trunk/sql/Makefile.msvc.w32 2008-06-17 12:31:53 UTC (rev 3311)
@@ -7,7 +7,7 @@
sql_SCRIPTS = dbinit_mysql.sql dbinit_pgsql.sql dbinit_mssql.sql dbinit_oracle.sql dbinit_sqlite.sql
ROOT_FILE = dbinit.in
-SOURCE = $(ROOT_FILE) schema.in setup.in events.in images.in policy.in objtools.in scripts.in maps.in
+SOURCE = $(ROOT_FILE) database.in schema.in setup.in events.in images.in policy.in objtools.in scripts.in maps.in
HEADERS = ../include/netxmsdb.h ../include/nxevent.h ../include/nximage.h ../src/server/include/nms_locks.h
COMMAND = $(CPP) /EP /D_NETXMS_DB_SCHEMA_ /I../include /I../src/server/include
SQUEEZE = perl -e "while (<>) { if (! /^[\s\t\n]*$$/) { print; } }"
Modified: trunk/sql/Makefile.w32
===================================================================
--- trunk/sql/Makefile.w32 2008-06-17 11:33:16 UTC (rev 3310)
+++ trunk/sql/Makefile.w32 2008-06-17 12:31:53 UTC (rev 3311)
@@ -7,7 +7,7 @@
sql_SCRIPTS = dbinit_mysql.sql dbinit_pgsql.sql dbinit_mssql.sql dbinit_oracle.sql dbinit_sqlite.sql
ROOT_FILE = dbinit.in
-SOURCE = $(ROOT_FILE) schema.in setup.in events.in images.in maps.in policy.in objtools.in scripts.in maps.in
+SOURCE = $(ROOT_FILE) database.in schema.in setup.in events.in images.in maps.in policy.in objtools.in scripts.in maps.in
HEADERS = ../include/netxmsdb.h ../include/nxevent.h ../include/nximage.h ../src/server/include/nms_locks.h
COMMAND = $(CPP) -P -Wundef -D_NETXMS_DB_SCHEMA_ -I../include -I../src/server/include
SQUEEZE = perl -e "while (<>) { if (! /^[\s\t\n]*$$/) { print; } }"
Added: trunk/sql/database.in
===================================================================
--- trunk/sql/database.in (rev 0)
+++ trunk/sql/database.in 2008-06-17 12:31:53 UTC (rev 3311)
@@ -0,0 +1,59 @@
+/*
+** DB-specific settings for database initialization script.
+**
+** ex: syntax=c
+*/
+
+// Define common macros for uncommon data types
+// and database syntax type
+#if defined(DB_MSSQL)
+
+#define DB_SYNTAX 'MSSQL'
+#define SQL_TEXT text
+#define SQL_INT64 bigint
+#define TABLE_TYPE
+
+#elif defined(DB_POSTGRESQL)
+
+#define DB_SYNTAX 'PGSQL'
+#define SQL_TEXT varchar // change it to oid?
+#define SQL_INT64 bigint
+#define TABLE_TYPE
+
+#elif defined(DB_ORACLE)
+
+#define DB_SYNTAX 'ORACLE'
+#define SQL_TEXT clob
+#define SQL_INT64 number(20)
+#define TABLE_TYPE
+
+#elif defined(DB_SQLITE)
+
+#define DB_SYNTAX 'SQLITE'
+#define SQL_TEXT varchar
+#define SQL_INT64 number(20)
+#define TABLE_TYPE
+
+#elif defined(DB_MYSQL)
+
+#define DB_SYNTAX 'MYSQL'
+#define SQL_TEXT text
+#define SQL_INT64 bigint
+#define TABLE_TYPE
+//#define TABLE_TYPE TYPE=InnoDB
+
+#else
+
+#error Database type should be defined
+
+#endif
+
+// String concatenation for multi-line texts
+#if defined(DB_MSSQL)
+#define CONCAT +
+#elif defined(DB_ORACLE) || defined(DB_SQLITE)
+#define CONCAT ||
+#else
+#define CONCAT
+#endif
+
Modified: trunk/sql/dbinit.in
===================================================================
--- trunk/sql/dbinit.in 2008-06-17 11:33:16 UTC (rev 3310)
+++ trunk/sql/dbinit.in 2008-06-17 12:31:53 UTC (rev 3311)
@@ -14,59 +14,8 @@
#include <nxnt.h>
#include <nxtools.h>
-// Define common macros for uncommon data types
-// and database syntax type
-#if defined(DB_MSSQL)
+#include "database.in"
-#define DB_SYNTAX 'MSSQL'
-#define SQL_TEXT text
-#define SQL_INT64 bigint
-#define TABLE_TYPE
-
-#elif defined(DB_POSTGRESQL)
-
-#define DB_SYNTAX 'PGSQL'
-#define SQL_TEXT varchar // change it to oid?
-#define SQL_INT64 bigint
-#define TABLE_TYPE
-
-#elif defined(DB_ORACLE)
-
-#define DB_SYNTAX 'ORACLE'
-#define SQL_TEXT clob
-#define SQL_INT64 number(20)
-#define TABLE_TYPE
-
-#elif defined(DB_SQLITE)
-
-#define DB_SYNTAX 'SQLITE'
-#define SQL_TEXT varchar
-#define SQL_INT64 number(20)
-#define TABLE_TYPE
-
-#elif defined(DB_MYSQL)
-
-#define DB_SYNTAX 'MYSQL'
-#define SQL_TEXT text
-#define SQL_INT64 bigint
-#define TABLE_TYPE
-//#define TABLE_TYPE TYPE=InnoDB
-
-#else
-
-#error Database type should be defined
-
-#endif
-
-// String concatenation for multi-line texts
-#if defined(DB_MSSQL)
-#define CONCAT +
-#elif defined(DB_ORACLE) || defined(DB_SQLITE)
-#define CONCAT ||
-#else
-#define CONCAT
-#endif
-
// Start transaction
#if defined(DB_POSTGRESQL) || defined(DB_SQLITE)
Received on Tue Jun 17 2008 - 15:31:54 EEST
This archive was generated by hypermail 2.2.0 : Tue Jun 17 2008 - 15:28:10 EEST