More Oracle fixes. No identifiers longer than 30 chars.

diff --git a/ingo/scripts/sql/ingo.oci8.sql b/ingo/scripts/sql/ingo.oci8.sql
index 6e30525..3fd5a7c 100644 (file)
--- a/ingo/scripts/sql/ingo.oci8.sql
+++ b/ingo/scripts/sql/ingo.oci8.sql
@@ -72,11 +72,11 @@ CREATE TABLE ingo_shares (
     PRIMARY KEY (share_id)
 );
 
-CREATE INDEX ingo_shares_share_name_idx ON ingo_shares (share_name);
-CREATE INDEX ingo_shares_share_owner_idx ON ingo_shares (share_owner);
-CREATE INDEX ingo_shares_perm_creator_idx ON ingo_shares (perm_creator);
-CREATE INDEX ingo_shares_perm_default_idx ON ingo_shares (perm_default);
-CREATE INDEX ingo_shares_perm_guest_idx ON ingo_shares (perm_guest);
+CREATE INDEX ingo_shares_name_idx ON ingo_shares (share_name);
+CREATE INDEX ingo_shares_owner_idx ON ingo_shares (share_owner);
+CREATE INDEX ingo_shares_creator_idx ON ingo_shares (perm_creator);
+CREATE INDEX ingo_shares_default_idx ON ingo_shares (perm_default);
+CREATE INDEX ingo_shares_guest_idx ON ingo_shares (perm_guest);
 
 CREATE TABLE ingo_shares_groups (
     share_id NUMBER(16) NOT NULL,
@@ -84,9 +84,9 @@ CREATE TABLE ingo_shares_groups (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX ingo_shares_groups_share_id_idx ON ingo_shares_groups (share_id);
-CREATE INDEX ingo_shares_groups_group_uid_idx ON ingo_shares_groups (group_uid);
-CREATE INDEX ingo_shares_groups_perm_idx ON ingo_shares_groups (perm);
+CREATE INDEX ingo_groups_share_id_idx ON ingo_shares_groups (share_id);
+CREATE INDEX ingo_groups_group_uid_idx ON ingo_shares_groups (group_uid);
+CREATE INDEX ingo_groups_perm_idx ON ingo_shares_groups (perm);
 
 CREATE TABLE ingo_shares_users (
     share_id NUMBER(16) NOT NULL,
@@ -94,6 +94,6 @@ CREATE TABLE ingo_shares_users (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX ingo_shares_users_share_id_idx ON ingo_shares_users (share_id);
-CREATE INDEX ingo_shares_users_user_uid_idx ON ingo_shares_users (user_uid);
-CREATE INDEX ingo_shares_users_perm_idx ON ingo_shares_users (perm);
+CREATE INDEX ingo_users_share_id_idx ON ingo_shares_users (share_id);
+CREATE INDEX ingo_users_user_uid_idx ON ingo_shares_users (user_uid);
+CREATE INDEX ingo_users_perm_idx ON ingo_shares_users (perm);

diff --git a/ingo/scripts/sql/ingo.xml b/ingo/scripts/sql/ingo.xml
index 08871ee..21f5beb 100644 (file)
--- a/ingo/scripts/sql/ingo.xml
+++ b/ingo/scripts/sql/ingo.xml
@@ -278,7 +278,7 @@
    </index>
 
    <index>
-    <name>ingo_shares_share_name</name>
+    <name>ingo_shares_name</name>
     <field>
      <name>share_name</name>
      <sorting>ascending</sorting>
@@ -286,7 +286,7 @@
    </index>
 
    <index>
-    <name>ingo_shares_share_owner</name>
+    <name>ingo_shares_owner</name>
     <field>
      <name>share_owner</name>
      <sorting>ascending</sorting>
@@ -294,7 +294,7 @@
    </index>
 
    <index>
-    <name>ingo_shares_perm_creator</name>
+    <name>ingo_shares_creator</name>
     <field>
      <name>perm_creator</name>
      <sorting>ascending</sorting>
@@ -302,7 +302,7 @@
    </index>
 
    <index>
-    <name>ingo_shares_perm_default</name>
+    <name>ingo_shares_default</name>
     <field>
      <name>perm_default</name>
      <sorting>ascending</sorting>
@@ -310,7 +310,7 @@
    </index>
 
    <index>
-    <name>ingo_shares_perm_guest</name>
+    <name>ingo_shares_guest</name>
     <field>
      <name>perm_guest</name>
      <sorting>ascending</sorting>
@@ -349,7 +349,7 @@
    </field>
 
    <index>
-    <name>ingo_shares_groups_share_id</name>
+    <name>ingo_groups_share_id</name>
     <field>
      <name>share_id</name>
      <sorting>ascending</sorting>
@@ -357,7 +357,7 @@
    </index>
 
    <index>
-    <name>ingo_shares_groups_group_uid</name>
+    <name>ingo_groups_group_uid</name>
     <field>
      <name>group_uid</name>
      <sorting>ascending</sorting>
@@ -365,7 +365,7 @@
    </index>
 
    <index>
-    <name>ingo_shares_groups_perm</name>
+    <name>ingo_groups_perm</name>
     <field>
      <name>perm</name>
      <sorting>ascending</sorting>
@@ -404,7 +404,7 @@
    </field>
 
    <index>
-    <name>ingo_shares_users_share_id</name>
+    <name>ingo_users_share_id</name>
     <field>
      <name>share_id</name>
      <sorting>ascending</sorting>
@@ -412,7 +412,7 @@
    </index>
 
    <index>
-    <name>ingo_shares_users_user_uid</name>
+    <name>ingo_users_user_uid</name>
     <field>
      <name>user_uid</name>
      <sorting>ascending</sorting>
@@ -420,7 +420,7 @@
    </index>
 
    <index>
-    <name>ingo_shares_users_perm</name>
+    <name>ingo_users_perm</name>
     <field>
      <name>perm</name>
      <sorting>ascending</sorting>

diff --git a/kronolith/scripts/sql/kronolith.oci8.sql b/kronolith/scripts/sql/kronolith.oci8.sql
index 93af2e7..9830cc2 100644 (file)
--- a/kronolith/scripts/sql/kronolith.oci8.sql
+++ b/kronolith/scripts/sql/kronolith.oci8.sql
@@ -54,11 +54,11 @@ CREATE TABLE kronolith_shares (
     PRIMARY KEY (share_id)
 );
 
-CREATE INDEX kronolith_shares_share_name_idx ON kronolith_shares (share_name);
-CREATE INDEX kronolith_shares_share_owner_idx ON kronolith_shares (share_owner);
-CREATE INDEX kronolith_shares_perm_creator_idx ON kronolith_shares (perm_creator);
-CREATE INDEX kronolith_shares_perm_default_idx ON kronolith_shares (perm_default);
-CREATE INDEX kronolith_shares_perm_guest_idx ON kronolith_shares (perm_guest);
+CREATE INDEX kronolith_share_name_idx ON kronolith_shares (share_name);
+CREATE INDEX kronolith_share_owner_idx ON kronolith_shares (share_owner);
+CREATE INDEX kronolith_perm_creator_idx ON kronolith_shares (perm_creator);
+CREATE INDEX kronolith_perm_default_idx ON kronolith_shares (perm_default);
+CREATE INDEX kronolith_perm_guest_idx ON kronolith_shares (perm_guest);
 
 CREATE TABLE kronolith_shares_groups (
     share_id NUMBER(16) NOT NULL,
@@ -66,9 +66,9 @@ CREATE TABLE kronolith_shares_groups (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX kronolith_shares_groups_share_id_idx ON kronolith_shares_groups (share_id);
-CREATE INDEX kronolith_shares_groups_group_uid_idx ON kronolith_shares_groups (group_uid);
-CREATE INDEX kronolith_shares_groups_perm_idx ON kronolith_shares_groups (perm);
+CREATE INDEX kronolith_groups_share_id_idx ON kronolith_shares_groups (share_id);
+CREATE INDEX kronolith_groups_group_uid_idx ON kronolith_shares_groups (group_uid);
+CREATE INDEX kronolith_groups_perm_idx ON kronolith_shares_groups (perm);
 
 CREATE TABLE kronolith_shares_users (
     share_id NUMBER(16) NOT NULL,
@@ -76,9 +76,9 @@ CREATE TABLE kronolith_shares_users (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX kronolith_shares_users_share_id_idx ON kronolith_shares_users (share_id);
-CREATE INDEX kronolith_shares_users_user_uid_idx ON kronolith_shares_users (user_uid);
-CREATE INDEX kronolith_shares_users_perm_idx ON kronolith_shares_users (perm);
+CREATE INDEX kronolith_users_share_id_idx ON kronolith_shares_users (share_id);
+CREATE INDEX kronolith_users_user_uid_idx ON kronolith_shares_users (user_uid);
+CREATE INDEX kronolith_users_perm_idx ON kronolith_shares_users (perm);
 
 CREATE TABLE kronolith_resources (
     resource_id NUMBER(16) NOT NULL,

diff --git a/kronolith/scripts/sql/kronolith.xml b/kronolith/scripts/sql/kronolith.xml
index d2072e1..ed72063 100644 (file)
--- a/kronolith/scripts/sql/kronolith.xml
+++ b/kronolith/scripts/sql/kronolith.xml
@@ -306,7 +306,7 @@
    </field>
 
    <index>
-    <name>kronolith_shares_share_name</name>
+    <name>kronolith_share_name</name>
     <field>
      <name>share_name</name>
      <sorting>ascending</sorting>
@@ -314,7 +314,7 @@
    </index>
 
    <index>
-    <name>kronolith_shares_share_owner</name>
+    <name>kronolith_share_owner</name>
     <field>
      <name>share_owner</name>
      <sorting>ascending</sorting>
@@ -322,7 +322,7 @@
    </index>
 
    <index>
-    <name>kronolith_shares_perm_creator</name>
+    <name>kronolith_perm_creator</name>
     <field>
      <name>perm_creator</name>
      <sorting>ascending</sorting>
@@ -330,7 +330,7 @@
    </index>
 
    <index>
-    <name>kronolith_shares_perm_default</name>
+    <name>kronolith_perm_default</name>
     <field>
      <name>perm_default</name>
      <sorting>ascending</sorting>
@@ -338,7 +338,7 @@
    </index>
 
    <index>
-    <name>kronolith_shares_perm_guest</name>
+    <name>kronolith_perm_guest</name>
     <field>
      <name>perm_guest</name>
      <sorting>ascending</sorting>
@@ -389,7 +389,7 @@
    </field>
 
    <index>
-    <name>kronolith_shares_groups_share_id</name>
+    <name>kronolith_groups_share_id</name>
     <field>
      <name>share_id</name>
      <sorting>ascending</sorting>
@@ -397,7 +397,7 @@
    </index>
 
    <index>
-    <name>kronolith_shares_groups_group_uid</name>
+    <name>kronolith_groups_group_uid</name>
     <field>
      <name>group_uid</name>
      <sorting>ascending</sorting>
@@ -405,7 +405,7 @@
    </index>
 
    <index>
-    <name>kronolith_shares_groups_perm</name>
+    <name>kronolith_groups_perm</name>
     <field>
      <name>perm</name>
      <sorting>ascending</sorting>
@@ -447,7 +447,7 @@
    </field>
 
    <index>
-    <name>kronolith_shares_users_share_id</name>
+    <name>kronolith_users_share_id</name>
     <field>
      <name>share_id</name>
      <sorting>ascending</sorting>
@@ -455,7 +455,7 @@
    </index>
 
    <index>
-    <name>kronolith_shares_users_user_uid</name>
+    <name>kronolith_users_user_uid</name>
     <field>
      <name>user_uid</name>
      <sorting>ascending</sorting>
@@ -463,7 +463,7 @@
    </index>
 
    <index>
-    <name>kronolith_shares_users_perm</name>
+    <name>kronolith_users_perm</name>
     <field>
      <name>perm</name>
      <sorting>ascending</sorting>

diff --git a/kronolith/scripts/upgrades/2.1_to_2.2.oci8.sql b/kronolith/scripts/upgrades/2.1_to_2.2.oci8.sql
index 4225391..6247951 100644 (file)
--- a/kronolith/scripts/upgrades/2.1_to_2.2.oci8.sql
+++ b/kronolith/scripts/upgrades/2.1_to_2.2.oci8.sql
@@ -14,11 +14,11 @@ CREATE TABLE kronolith_shares (
     PRIMARY KEY (share_id)
 );
 
-CREATE INDEX kronolith_shares_share_name_idx ON kronolith_shares (share_name);
-CREATE INDEX kronolith_shares_share_owner_idx ON kronolith_shares (share_owner);
-CREATE INDEX kronolith_shares_perm_creator_idx ON kronolith_shares (perm_creator);
-CREATE INDEX kronolith_shares_perm_default_idx ON kronolith_shares (perm_default);
-CREATE INDEX kronolith_shares_perm_guest_idx ON kronolith_shares (perm_guest);
+CREATE INDEX kronolith_shares_name_idx ON kronolith_shares (share_name);
+CREATE INDEX kronolith_shares_owner_idx ON kronolith_shares (share_owner);
+CREATE INDEX kronolith_shares_creator_idx ON kronolith_shares (perm_creator);
+CREATE INDEX kronolith_shares_default_idx ON kronolith_shares (perm_default);
+CREATE INDEX kronolith_shares_guest_idx ON kronolith_shares (perm_guest);
 
 CREATE TABLE kronolith_shares_groups (
     share_id NUMBER(16) NOT NULL,
@@ -26,9 +26,9 @@ CREATE TABLE kronolith_shares_groups (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX kronolith_shares_groups_share_id_idx ON kronolith_shares_groups (share_id);
-CREATE INDEX kronolith_shares_groups_group_uid_idx ON kronolith_shares_groups (group_uid);
-CREATE INDEX kronolith_shares_groups_perm_idx ON kronolith_shares_groups (perm);
+CREATE INDEX kronolith_groups_share_id_idx ON kronolith_shares_groups (share_id);
+CREATE INDEX kronolith_groups_group_uid_idx ON kronolith_shares_groups (group_uid);
+CREATE INDEX kronolith_groups_perm_idx ON kronolith_shares_groups (perm);
 
 CREATE TABLE kronolith_shares_users (
     share_id NUMBER(16) NOT NULL,
@@ -36,6 +36,6 @@ CREATE TABLE kronolith_shares_users (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX kronolith_shares_users_share_id_idx ON kronolith_shares_users (share_id);
-CREATE INDEX kronolith_shares_users_user_uid_idx ON kronolith_shares_users (user_uid);
-CREATE INDEX kronolith_shares_users_perm_idx ON kronolith_shares_users (perm);
+CREATE INDEX kronolith_users_share_id_idx ON kronolith_shares_users (share_id);
+CREATE INDEX kronolith_users_user_uid_idx ON kronolith_shares_users (user_uid);
+CREATE INDEX kronolith_users_perm_idx ON kronolith_shares_users (perm);

diff --git a/nag/scripts/sql/nag.oci8.sql b/nag/scripts/sql/nag.oci8.sql
index de8e6d0..527eb27 100644 (file)
--- a/nag/scripts/sql/nag.oci8.sql
+++ b/nag/scripts/sql/nag.oci8.sql
@@ -38,11 +38,11 @@ CREATE TABLE nag_shares (
     PRIMARY KEY (share_id)
 );
 
-CREATE INDEX nag_shares_share_name_idx ON nag_shares (share_name);
-CREATE INDEX nag_shares_share_owner_idx ON nag_shares (share_owner);
-CREATE INDEX nag_shares_perm_creator_idx ON nag_shares (perm_creator);
-CREATE INDEX nag_shares_perm_default_idx ON nag_shares (perm_default);
-CREATE INDEX nag_shares_perm_guest_idx ON nag_shares (perm_guest);
+CREATE INDEX nag_shares_name_idx ON nag_shares (share_name);
+CREATE INDEX nag_shares_owner_idx ON nag_shares (share_owner);
+CREATE INDEX nag_shares_creator_idx ON nag_shares (perm_creator);
+CREATE INDEX nag_shares_default_idx ON nag_shares (perm_default);
+CREATE INDEX nag_shares_guest_idx ON nag_shares (perm_guest);
 
 CREATE TABLE nag_shares_groups (
     share_id NUMBER(16) NOT NULL,
@@ -50,9 +50,9 @@ CREATE TABLE nag_shares_groups (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX nag_shares_groups_share_id_idx ON nag_shares_groups (share_id);
-CREATE INDEX nag_shares_groups_group_uid_idx ON nag_shares_groups (group_uid);
-CREATE INDEX nag_shares_groups_perm_idx ON nag_shares_groups (perm);
+CREATE INDEX nag_groups_share_id_idx ON nag_shares_groups (share_id);
+CREATE INDEX nag_groups_group_uid_idx ON nag_shares_groups (group_uid);
+CREATE INDEX nag_groups_perm_idx ON nag_shares_groups (perm);
 
 CREATE TABLE nag_shares_users (
     share_id NUMBER(16) NOT NULL,
@@ -60,6 +60,6 @@ CREATE TABLE nag_shares_users (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX nag_shares_users_share_id_idx ON nag_shares_users (share_id);
-CREATE INDEX nag_shares_users_user_uid_idx ON nag_shares_users (user_uid);
-CREATE INDEX nag_shares_users_perm_idx ON nag_shares_users (perm);
+CREATE INDEX nag_users_share_id_idx ON nag_shares_users (share_id);
+CREATE INDEX nag_users_user_uid_idx ON nag_shares_users (user_uid);
+CREATE INDEX nag_users_perm_idx ON nag_shares_users (perm);

diff --git a/nag/scripts/sql/nag.xml b/nag/scripts/sql/nag.xml
index 39e545e..ab80161 100644 (file)
--- a/nag/scripts/sql/nag.xml
+++ b/nag/scripts/sql/nag.xml
@@ -241,7 +241,7 @@
    </field>
 
    <index>
-    <name>nag_shares_share_name</name>
+    <name>nag_shares_name</name>
     <field>
      <name>share_name</name>
      <sorting>ascending</sorting>
@@ -249,7 +249,7 @@
    </index>
 
    <index>
-    <name>nag_shares_share_owner</name>
+    <name>nag_shares_owner</name>
     <field>
      <name>share_owner</name>
      <sorting>ascending</sorting>
@@ -257,7 +257,7 @@
    </index>
 
    <index>
-    <name>nag_shares_perm_creator</name>
+    <name>nag_shares_creator</name>
     <field>
      <name>perm_creator</name>
      <sorting>ascending</sorting>
@@ -265,7 +265,7 @@
    </index>
 
    <index>
-    <name>nag_shares_perm_default</name>
+    <name>nag_shares_default</name>
     <field>
      <name>perm_default</name>
      <sorting>ascending</sorting>
@@ -273,7 +273,7 @@
    </index>
 
    <index>
-    <name>nag_shares_perm_guest</name>
+    <name>nag_shares_guest</name>
     <field>
      <name>perm_guest</name>
      <sorting>ascending</sorting>
@@ -324,7 +324,7 @@
    </field>
 
    <index>
-    <name>nag_shares_groups_share_id</name>
+    <name>nag_groups_share_id</name>
     <field>
      <name>share_id</name>
      <sorting>ascending</sorting>
@@ -332,7 +332,7 @@
    </index>
 
    <index>
-    <name>nag_shares_groups_group_uid</name>
+    <name>nag_groups_group_uid</name>
     <field>
      <name>group_uid</name>
      <sorting>ascending</sorting>
@@ -340,7 +340,7 @@
    </index>
 
    <index>
-    <name>nag_shares_groups_perm</name>
+    <name>nag_groups_perm</name>
     <field>
      <name>perm</name>
      <sorting>ascending</sorting>
@@ -382,7 +382,7 @@
    </field>
 
    <index>
-    <name>nag_shares_users_share_id</name>
+    <name>nag_users_share_id</name>
     <field>
      <name>share_id</name>
      <sorting>ascending</sorting>
@@ -390,7 +390,7 @@
    </index>
 
    <index>
-    <name>nag_shares_users_user_uid</name>
+    <name>nag_users_user_uid</name>
     <field>
      <name>user_uid</name>
      <sorting>ascending</sorting>
@@ -398,7 +398,7 @@
    </index>
 
    <index>
-    <name>nag_shares_users_perm</name>
+    <name>nag_users_perm</name>
     <field>
      <name>perm</name>
      <sorting>ascending</sorting>

diff --git a/nag/scripts/upgrades/2.1_to_2.2.oci8.sql b/nag/scripts/upgrades/2.1_to_2.2.oci8.sql
index d9cafba..90ac1b6 100644 (file)
--- a/nag/scripts/upgrades/2.1_to_2.2.oci8.sql
+++ b/nag/scripts/upgrades/2.1_to_2.2.oci8.sql
@@ -1,7 +1,9 @@
 ALTER TABLE nag_tasks ADD task_estimate FLOAT;
 ALTER TABLE nag_tasks ADD task_completed_date NUMBER(16);
 ALTER TABLE nag_tasks ADD task_start NUMBER(16);
-ALTER TABLE nag_tasks ADD task_parent VARCHAR2(32) DEFAULT '' NOT NULL;
+ALTER TABLE nag_tasks ADD task_parent VARCHAR2(32) DEFAULT '';
+UPDATE nag_tasks SET task_parent = '';
+ALTER TABLE nag_tasks MODIFY (task_parent NOT NULL);
 
 CREATE INDEX nag_start_idx ON nag_tasks (task_start);
 
@@ -18,11 +20,11 @@ CREATE TABLE nag_shares (
     PRIMARY KEY (share_id)
 );
 
-CREATE INDEX nag_shares_share_name_idx ON nag_shares (share_name);
-CREATE INDEX nag_shares_share_owner_idx ON nag_shares (share_owner);
-CREATE INDEX nag_shares_perm_creator_idx ON nag_shares (perm_creator);
-CREATE INDEX nag_shares_perm_default_idx ON nag_shares (perm_default);
-CREATE INDEX nag_shares_perm_guest_idx ON nag_shares (perm_guest);
+CREATE INDEX nag_shares_name_idx ON nag_shares (share_name);
+CREATE INDEX nag_shares_owner_idx ON nag_shares (share_owner);
+CREATE INDEX nag_shares_creator_idx ON nag_shares (perm_creator);
+CREATE INDEX nag_shares_default_idx ON nag_shares (perm_default);
+CREATE INDEX nag_shares_guest_idx ON nag_shares (perm_guest);
 
 CREATE TABLE nag_shares_groups (
     share_id NUMBER(16) NOT NULL,
@@ -30,9 +32,9 @@ CREATE TABLE nag_shares_groups (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX nag_shares_groups_share_id_idx ON nag_shares_groups (share_id);
-CREATE INDEX nag_shares_groups_group_uid_idx ON nag_shares_groups (group_uid);
-CREATE INDEX nag_shares_groups_perm_idx ON nag_shares_groups (perm);
+CREATE INDEX nag_groups_share_id_idx ON nag_shares_groups (share_id);
+CREATE INDEX nag_groups_group_uid_idx ON nag_shares_groups (group_uid);
+CREATE INDEX nag_groups_perm_idx ON nag_shares_groups (perm);
 
 CREATE TABLE nag_shares_users (
     share_id NUMBER(16) NOT NULL,
@@ -40,6 +42,6 @@ CREATE TABLE nag_shares_users (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX nag_shares_users_share_id_idx ON nag_shares_users (share_id);
-CREATE INDEX nag_shares_users_user_uid_idx ON nag_shares_users (user_uid);
-CREATE INDEX nag_shares_users_perm_idx ON nag_shares_users (perm);
+CREATE INDEX nag_users_share_id_idx ON nag_shares_users (share_id);
+CREATE INDEX nag_users_user_uid_idx ON nag_shares_users (user_uid);
+CREATE INDEX nag_users_perm_idx ON nag_shares_users (perm);

diff --git a/turba/scripts/sql/turba.oci8.sql b/turba/scripts/sql/turba.oci8.sql
index 17a85de..7a15154 100644 (file)
--- a/turba/scripts/sql/turba.oci8.sql
+++ b/turba/scripts/sql/turba.oci8.sql
@@ -66,11 +66,11 @@ CREATE TABLE turba_shares (
     PRIMARY KEY (share_id)
 );
 
-CREATE INDEX turba_shares_share_name_idx ON turba_shares (share_name);
-CREATE INDEX turba_shares_share_owner_idx ON turba_shares (share_owner);
-CREATE INDEX turba_shares_perm_creator_idx ON turba_shares (perm_creator);
-CREATE INDEX turba_shares_perm_default_idx ON turba_shares (perm_default);
-CREATE INDEX turba_shares_perm_guest_idx ON turba_shares (perm_guest);
+CREATE INDEX turba_shares_name_idx ON turba_shares (share_name);
+CREATE INDEX turba_shares_owner_idx ON turba_shares (share_owner);
+CREATE INDEX turba_shares_creator_idx ON turba_shares (perm_creator);
+CREATE INDEX turba_shares_default_idx ON turba_shares (perm_default);
+CREATE INDEX turba_shares_guest_idx ON turba_shares (perm_guest);
 
 CREATE TABLE turba_shares_groups (
     share_id NUMBER(16) NOT NULL,
@@ -78,9 +78,9 @@ CREATE TABLE turba_shares_groups (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX turba_shares_groups_share_id_idx ON turba_shares_groups (share_id);
-CREATE INDEX turba_shares_groups_group_uid_idx ON turba_shares_groups (group_uid);
-CREATE INDEX turba_shares_groups_perm_idx ON turba_shares_groups (perm);
+CREATE INDEX turba_groups_share_id_idx ON turba_shares_groups (share_id);
+CREATE INDEX turba_groups_group_uid_idx ON turba_shares_groups (group_uid);
+CREATE INDEX turba_groups_perm_idx ON turba_shares_groups (perm);
 
 CREATE TABLE turba_shares_users (
     share_id NUMBER(16) NOT NULL,
@@ -88,6 +88,6 @@ CREATE TABLE turba_shares_users (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX turba_shares_users_share_id_idx ON turba_shares_users (share_id);
-CREATE INDEX turba_shares_users_user_uid_idx ON turba_shares_users (user_uid);
-CREATE INDEX turba_shares_users_perm_idx ON turba_shares_users (perm);
+CREATE INDEX turba_users_share_id_idx ON turba_shares_users (share_id);
+CREATE INDEX turba_users_user_uid_idx ON turba_shares_users (user_uid);
+CREATE INDEX turba_users_perm_idx ON turba_shares_users (perm);

diff --git a/turba/scripts/sql/turba.xml b/turba/scripts/sql/turba.xml
index 0ec8afe..fa859d6 100644 (file)
--- a/turba/scripts/sql/turba.xml
+++ b/turba/scripts/sql/turba.xml
@@ -407,7 +407,7 @@
    </field>
 
    <index>
-    <name>turba_shares_share_name</name>
+    <name>turba_shares_name</name>
     <field>
      <name>share_name</name>
      <sorting>ascending</sorting>
@@ -415,7 +415,7 @@
    </index>
 
    <index>
-    <name>turba_shares_share_owner</name>
+    <name>turba_shares_owner</name>
     <field>
      <name>share_owner</name>
      <sorting>ascending</sorting>
@@ -423,7 +423,7 @@
    </index>
 
    <index>
-    <name>turba_shares_perm_creator</name>
+    <name>turba_shares_creator</name>
     <field>
      <name>perm_creator</name>
      <sorting>ascending</sorting>
@@ -431,7 +431,7 @@
    </index>
 
    <index>
-    <name>turba_shares_perm_default</name>
+    <name>turba_shares_default</name>
     <field>
      <name>perm_default</name>
      <sorting>ascending</sorting>
@@ -439,7 +439,7 @@
    </index>
 
    <index>
-    <name>turba_shares_perm_guest</name>
+    <name>turba_shares_guest</name>
     <field>
      <name>perm_guest</name>
      <sorting>ascending</sorting>
@@ -490,7 +490,7 @@
    </field>
 
    <index>
-    <name>turba_shares_groups_share_id</name>
+    <name>turba_groups_share_id</name>
     <field>
      <name>share_id</name>
      <sorting>ascending</sorting>
@@ -498,7 +498,7 @@
    </index>
 
    <index>
-    <name>turba_shares_groups_group_uid</name>
+    <name>turba_groups_group_uid</name>
     <field>
      <name>group_uid</name>
      <sorting>ascending</sorting>
@@ -506,7 +506,7 @@
    </index>
 
    <index>
-    <name>turba_shares_groups_perm</name>
+    <name>turba_groups_perm</name>
     <field>
      <name>perm</name>
      <sorting>ascending</sorting>
@@ -548,7 +548,7 @@
    </field>
 
    <index>
-    <name>turba_shares_users_share_id</name>
+    <name>turba_users_share_id</name>
     <field>
      <name>share_id</name>
      <sorting>ascending</sorting>
@@ -556,7 +556,7 @@
    </index>
 
    <index>
-    <name>turba_shares_users_user_uid</name>
+    <name>turba_users_user_uid</name>
     <field>
      <name>user_uid</name>
      <sorting>ascending</sorting>
@@ -564,7 +564,7 @@
    </index>
 
    <index>
-    <name>turba_shares_users_perm</name>
+    <name>turba_users_perm</name>
     <field>
      <name>perm</name>
      <sorting>ascending</sorting>

diff --git a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql
index 1ddc102..e593edc 100644 (file)
--- a/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql
+++ b/turba/scripts/upgrades/2.1_to_2.2_add_sql_share_tables.oci8.sql
@@ -12,11 +12,11 @@ CREATE TABLE turba_shares (
     PRIMARY KEY (share_id)
 );
 
-CREATE INDEX turba_shares_share_name_idx ON turba_shares (share_name);
-CREATE INDEX turba_shares_share_owner_idx ON turba_shares (share_owner);
-CREATE INDEX turba_shares_perm_creator_idx ON turba_shares (perm_creator);
-CREATE INDEX turba_shares_perm_default_idx ON turba_shares (perm_default);
-CREATE INDEX turba_shares_perm_guest_idx ON turba_shares (perm_guest);
+CREATE INDEX turba_shares_name_idx ON turba_shares (share_name);
+CREATE INDEX turba_shares_owner_idx ON turba_shares (share_owner);
+CREATE INDEX turba_shares_creator_idx ON turba_shares (perm_creator);
+CREATE INDEX turba_shares_default_idx ON turba_shares (perm_default);
+CREATE INDEX turba_shares_guest_idx ON turba_shares (perm_guest);
 
 CREATE TABLE turba_shares_groups (
     share_id NUMBER(16) NOT NULL,
@@ -24,9 +24,9 @@ CREATE TABLE turba_shares_groups (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX turba_shares_groups_share_id_idx ON turba_shares_groups (share_id);
-CREATE INDEX turba_shares_groups_group_uid_idx ON turba_shares_groups (group_uid);
-CREATE INDEX turba_shares_groups_perm_idx ON turba_shares_groups (perm);
+CREATE INDEX turba_groups_share_id_idx ON turba_shares_groups (share_id);
+CREATE INDEX turba_groups_group_uid_idx ON turba_shares_groups (group_uid);
+CREATE INDEX turba_groups_perm_idx ON turba_shares_groups (perm);
 
 CREATE TABLE turba_shares_users (
     share_id NUMBER(16) NOT NULL,
@@ -34,6 +34,6 @@ CREATE TABLE turba_shares_users (
     perm NUMBER(8) NOT NULL
 );
 
-CREATE INDEX turba_shares_users_share_id_idx ON turba_shares_users (share_id);
-CREATE INDEX turba_shares_users_user_uid_idx ON turba_shares_users (user_uid);
-CREATE INDEX turba_shares_users_perm_idx ON turba_shares_users (perm);
+CREATE INDEX turba_users_share_id_idx ON turba_shares_users (share_id);
+CREATE INDEX turba_users_user_uid_idx ON turba_shares_users (user_uid);
+CREATE INDEX turba_users_perm_idx ON turba_shares_users (perm);