You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/01/29 14:01:46 UTC

cvs commit: jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms SQLServerSchema.sql

ozeigermann    2004/01/29 05:01:46

  Modified:    src/doc  Tag: SLIDE_2_0_RELEASE_BRANCH changelog.xml
               src/stores/org/apache/slide/store/impl/rdbms Tag:
                        SLIDE_2_0_RELEASE_BRANCH SQLServerSchema.sql
  Log:
  Applied varchar to nvarchar patch contributed by Jacob Lund <jl...@qualiware.com>
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.84.2.6  +2 -0      jakarta-slide/src/doc/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/doc/changelog.xml,v
  retrieving revision 1.84.2.5
  retrieving revision 1.84.2.6
  diff -u -r1.84.2.5 -r1.84.2.6
  --- changelog.xml	29 Jan 2004 12:25:50 -0000	1.84.2.5
  +++ changelog.xml	29 Jan 2004 13:01:46 -0000	1.84.2.6
  @@ -15,6 +15,8 @@
   release.
       	
         <changelog>
  +      	<fix date="Januray 29, 2004" author="ozeigermann">SQL Server now allows for unicode in all strings. Patched contributed by Jacob Lund.</fix>
  +
         	<add date="Januray 29, 2004" author="ozeigermann">Added flag to configure if tx file store shall use encoded names or plain ones. Plaines are the default.</add>
         <fix date="January 26, 2004" author="pnever">
         Final fixes to get the DeltaV testcases error-free.
  
  
  
  No                   revision
  No                   revision
  1.6.2.1   +15 -16    jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/SQLServerSchema.sql
  
  Index: SQLServerSchema.sql
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/stores/org/apache/slide/store/impl/rdbms/SQLServerSchema.sql,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- SQLServerSchema.sql	9 Jan 2004 19:39:18 -0000	1.6
  +++ SQLServerSchema.sql	29 Jan 2004 13:01:46 -0000	1.6.2.1
  @@ -96,19 +96,19 @@
   sp_addtype id_type,           bigint
   GO
   
  -sp_addtype uri_str_type,     "varchar(800)"
  +sp_addtype uri_str_type,     "nvarchar(800)"
   GO
   
  -sp_addtype revision_no_type, "varchar(20)"
  +sp_addtype revision_no_type, "nvarchar(20)"
   GO
   
   sp_addtype hash_type,         bigint
   GO
   
  -sp_addtype literal_str_type, "varchar(3000)"
  +sp_addtype literal_str_type, "nvarchar(3000)"
   GO
   
  -sp_addtype value_str_type,   "varchar(255)"
  +sp_addtype value_str_type,   "nvarchar(255)"
   GO
   
   /**********************************************************************/
  @@ -132,7 +132,7 @@
   
   CREATE TABLE dbo.OBJECT (
       URI_ID          id_type               PRIMARY KEY,
  -    CLASS_NAME      varchar(255)          NOT NULL,
  +    CLASS_NAME      nvarchar(255)          NOT NULL,
       CONSTRAINT      FK_OBJECT_URI_ID
          FOREIGN KEY (URI_ID)
          REFERENCES   URI (URI_ID)
  @@ -188,7 +188,7 @@
       EXPIRATION_DATE numeric(14, 0)   	  NOT NULL,
       IS_INHERITABLE  bit                   NOT NULL, 
       IS_EXCLUSIVE    bit                   NOT NULL,
  -    OWNER           varchar(255),
  +    OWNER           nvarchar(255),
       CONSTRAINT      FK_LOCKS_LOCK_ID
          FOREIGN KEY (LOCK_ID)
          REFERENCES   URI (URI_ID)
  @@ -197,14 +197,14 @@
   
   CREATE TABLE dbo.BRANCH ( 
       BRANCH_ID       id_type               IDENTITY  UNIQUE NOT NULL,
  -    BRANCH_STRING   varchar(255)          UNIQUE NOT NULL,
  +    BRANCH_STRING   nvarchar(255)          UNIQUE NOT NULL,
       UNIQUE NONCLUSTERED (BRANCH_ID)
   )
   GO
   
   CREATE TABLE dbo.LABEL (
       LABEL_ID        id_type               IDENTITY  UNIQUE NOT NULL,
  -    LABEL_STRING    varchar(255)          NOT NULL,
  +    LABEL_STRING    nvarchar(255)          NOT NULL,
       UNIQUE NONCLUSTERED (LABEL_ID)
   )
   GO
  @@ -224,7 +224,7 @@
          REFERENCES   VERSION (URI_ID),
       BRANCH_ID       id_type               NOT NULL  FOREIGN KEY
          REFERENCES   BRANCH (BRANCH_ID),
  -    REVISION_NO     VARCHAR(20)	       	  NOT NULL,
  +    REVISION_NO     nVARCHAR(20)	       	  NOT NULL,
       --UNIQUE CLUSTERED (URI_ID, BRANCH_ID, REVISION_NO)
   )
   GO
  @@ -265,10 +265,10 @@
   CREATE TABLE dbo.PROPERTIES (
       VERSION_ID         id_type            NOT NULL  FOREIGN KEY
           REFERENCES  VERSION_HISTORY (VERSION_ID),    
  -    PROPERTY_NAMESPACE varchar(50)        NOT NULL, 
  -    PROPERTY_NAME      varchar(50)        NOT NULL,        
  -    PROPERTY_VALUE     varchar(255)       NOT NULL,
  -    PROPERTY_TYPE      varchar(50)        NOT NULL, 
  +    PROPERTY_NAMESPACE nvarchar(50)        NOT NULL, 
  +    PROPERTY_NAME      nvarchar(50)        NOT NULL,        
  +    PROPERTY_VALUE     nvarchar(255)       NOT NULL,
  +    PROPERTY_TYPE      nvarchar(50)        NOT NULL, 
       IS_PROTECTED       bit                NOT NULL,
       UNIQUE CLUSTERED (VERSION_ID, PROPERTY_NAMESPACE, PROPERTY_NAME)
   )
  @@ -281,7 +281,7 @@
          REFERENCES   URI (URI_ID),
       ACTION_ID       id_type               NOT NULL  FOREIGN KEY
          REFERENCES   URI (URI_ID),
  -    VERSION_NO      VARCHAR(20)           NULL,
  +    VERSION_NO      nVARCHAR(20)           NULL,
       IS_INHERITABLE  bit                   NOT NULL,
       IS_NEGATIVE     bit                   NOT NULL,
       -- Both order and sequence would be more suitable, but can not be used
  @@ -289,5 +289,4 @@
       UNIQUE CLUSTERED (OBJECT_ID, SUBJECT_ID, ACTION_ID),
       UNIQUE (OBJECT_ID, SUCCESSION)
   )
  -GO
  -
  +GO
  \ No newline at end of file
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org