diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-06-26 09:33:55 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-06-26 09:33:55 +0000 |
| commit | 8c1d6551dd62846de078b06b522682d5ff9a5761 (patch) | |
| tree | 141573b0a97725696b80432006a729524dfc9a1d /create | |
| parent | 7e29b11b479f6987a21161c051252bbfbea655f8 (diff) | |
| download | zabbix-8c1d6551dd62846de078b06b522682d5ff9a5761.tar.gz zabbix-8c1d6551dd62846de078b06b522682d5ff9a5761.tar.xz zabbix-8c1d6551dd62846de078b06b522682d5ff9a5761.zip | |
- fixes for Oracle and SQLite schemas (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@4365 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'create')
| -rwxr-xr-x | create/schema/gen.pl | 13 | ||||
| -rw-r--r-- | create/schema/schema.sql | 18 |
2 files changed, 19 insertions, 12 deletions
diff --git a/create/schema/gen.pl b/create/schema/gen.pl index f47c51d8..53c03c76 100755 --- a/create/schema/gen.pl +++ b/create/schema/gen.pl @@ -38,7 +38,8 @@ local $output; "t_integer" => "integer", "t_time" => "integer", "t_serial" => "serial", - "t_double" => "double", + "t_double" => "double(16,4)", + "t_percentage" => "double(5,2)", "t_varchar" => "varchar", "t_char" => "char", "t_image" => "longblob", @@ -56,6 +57,7 @@ local $output; "t_time" => "ZBX_TYPE_INT", "t_serial" => "ZBX_TYPE_UINT", "t_double" => "ZBX_TYPE_FLOAT", + "t_percentage" => "ZBX_TYPE_FLOAT", "t_varchar" => "ZBX_TYPE_CHAR", "t_char" => "ZBX_TYPE_CHAR", "t_image" => "ZBX_TYPE_BLOB", @@ -92,8 +94,10 @@ static ZBX_TABLE tables[]={ "type" => "sql", "t_id" => "number(20)", "t_integer" => "number(10)", + "t_time" => "number(10)", "t_serial" => "number(20)", "t_double" => "number(20,4)", + "t_percentage" => "number(5,2)", "t_varchar" => "varchar2", "t_char" => "varchar2", "t_image" => "blob", @@ -111,7 +115,8 @@ static ZBX_TABLE tables[]={ "t_id" => "bigint", "t_integer" => "integer", "t_serial" => "serial", - "t_double" => "numeric", + "t_double" => "numeric(16,4)", + "t_percentage" => "numeric(5,2)", "t_varchar" => "varchar", "t_char" => "char", "t_image" => "bytea", @@ -128,8 +133,10 @@ static ZBX_TABLE tables[]={ "type" => "sql", "t_id" => "bigint", "t_integer" => "integer", + "t_time" => "integer", "t_serial" => "serial", - "t_double" => "double", + "t_double" => "double(16,4)", + "t_percentage" => "double(5,2)", "t_varchar" => "varchar", "t_char" => "char", "t_image" => "longblob", diff --git a/create/schema/schema.sql b/create/schema/schema.sql index 7561b408..571fcae4 100644 --- a/create/schema/schema.sql +++ b/create/schema/schema.sql @@ -88,7 +88,7 @@ FIELD |delay |t_integer |'60' |NOT NULL |ZBX_SYNC FIELD |status |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |macros |t_blob |'' |NOT NULL |ZBX_SYNC FIELD |agent |t_varchar(255) |'' |NOT NULL |ZBX_SYNC -FIELD |time |t_double(16,4) |'0' |NOT NULL |ZBX_SYNC +FIELD |time |t_double |'0' |NOT NULL |ZBX_SYNC FIELD |error |t_varchar(255) |'' |NOT NULL |ZBX_SYNC INDEX |httptest_1 |httptestid @@ -169,7 +169,7 @@ FIELD |id |t_serial | | |ZBX_SYNC FIELD |nodeid |t_id |'0' |NOT NULL |ZBX_SYNC FIELD |itemid |t_id |'0' |NOT NULL |ZBX_SYNC FIELD |clock |t_time |'0' |NOT NULL |ZBX_SYNC -FIELD |value |t_double(16,4) |'0.0000' |NOT NULL |ZBX_SYNC +FIELD |value |t_double |'0.0000' |NOT NULL |ZBX_SYNC INDEX |1 |nodeid,id TABLE|history_uint_sync|id| @@ -226,7 +226,7 @@ INDEX |2 |clock TABLE|history||0 FIELD |itemid |t_id |'0' |NOT NULL |ZBX_SYNC FIELD |clock |t_time |'0' |NOT NULL |ZBX_SYNC -FIELD |value |t_double(16,4) |'0.0000' |NOT NULL |ZBX_SYNC +FIELD |value |t_double |'0.0000' |NOT NULL |ZBX_SYNC INDEX |1 |itemid,clock TABLE|history_uint||0 @@ -262,9 +262,9 @@ TABLE|trends|itemid,clock|0 FIELD |itemid |t_id |'0' |NOT NULL |ZBX_SYNC FIELD |clock |t_time |'0' |NOT NULL |ZBX_SYNC FIELD |num |t_integer |'0' |NOT NULL |ZBX_SYNC -FIELD |value_min |t_double(16,4) |'0.0000'|NOT NULL |ZBX_SYNC -FIELD |value_avg |t_double(16,4) |'0.0000'|NOT NULL |ZBX_SYNC -FIELD |value_max |t_double(16,4) |'0.0000'|NOT NULL |ZBX_SYNC +FIELD |value_min |t_double |'0.0000'|NOT NULL |ZBX_SYNC +FIELD |value_avg |t_double |'0.0000'|NOT NULL |ZBX_SYNC +FIELD |value_max |t_double |'0.0000'|NOT NULL |ZBX_SYNC -- Other tables @@ -345,8 +345,8 @@ FIELD |name |t_varchar(128) |'' |NOT NULL |ZBX_SYNC FIELD |width |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |height |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |yaxistype |t_integer |'0' |NOT NULL |ZBX_SYNC -FIELD |yaxismin |t_double(16,4) |'0' |NOT NULL |ZBX_SYNC -FIELD |yaxismax |t_double(16,4) |'0' |NOT NULL |ZBX_SYNC +FIELD |yaxismin |t_double |'0' |NOT NULL |ZBX_SYNC +FIELD |yaxismax |t_double |'0' |NOT NULL |ZBX_SYNC FIELD |templateid |t_id |'0' |NOT NULL |ZBX_SYNC FIELD |show_work_period|t_integer |'1' |NOT NULL |ZBX_SYNC FIELD |show_triggers |t_integer |'1' |NOT NULL |ZBX_SYNC @@ -552,7 +552,7 @@ FIELD |status |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |algorithm |t_integer |'0' |NOT NULL |ZBX_SYNC FIELD |triggerid |t_id | | |ZBX_SYNC FIELD |showsla |t_integer |'0' |NOT NULL |ZBX_SYNC -FIELD |goodsla |t_double(5,2) |'99.9' |NOT NULL |ZBX_SYNC +FIELD |goodsla |t_percentage |'99.9' |NOT NULL |ZBX_SYNC FIELD |sortorder |t_integer |'0' |NOT NULL |ZBX_SYNC TABLE|service_alarms|servicealarmid|0 |