diff --git a/OGoContentStore/appointment-oracle.ocs b/OGoContentStore/appointment-oracle.ocs index e0fb8d531..c4cc624ff 100644 --- a/OGoContentStore/appointment-oracle.ocs +++ b/OGoContentStore/appointment-oracle.ocs @@ -6,13 +6,13 @@ fields = ( { columnName = c_name; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = NO; isPrimaryKey = YES; }, { columnName = c_uid; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = NO; }, { @@ -77,12 +77,12 @@ }, { columnName = c_location; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { columnName = c_orgmail; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { @@ -92,7 +92,7 @@ }, { columnName = c_partstates; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { diff --git a/OGoContentStore/appointment.ocs b/OGoContentStore/appointment.ocs index 19a54d41b..95a79fdec 100644 --- a/OGoContentStore/appointment.ocs +++ b/OGoContentStore/appointment.ocs @@ -6,13 +6,13 @@ fields = ( { columnName = c_name; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = NO; isPrimaryKey = YES; }, { columnName = c_uid; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = NO; }, { @@ -77,12 +77,12 @@ }, { columnName = c_location; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { columnName = c_orgmail; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { @@ -92,7 +92,7 @@ }, { columnName = c_partstates; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { diff --git a/OGoContentStore/contact-oracle.ocs b/OGoContentStore/contact-oracle.ocs index 9d2b4f262..b01621b2a 100644 --- a/OGoContentStore/contact-oracle.ocs +++ b/OGoContentStore/contact-oracle.ocs @@ -6,53 +6,53 @@ fields = ( { columnName = c_name; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = NO; isPrimaryKey = YES; }, { columnName = c_givenname; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { columnName = c_cn; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { columnName = c_sn; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { columnName = c_screenname; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { columnName = c_l; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { columnName = c_mail; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { columnName = c_o; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { columnName = c_ou; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { columnName = c_telephoneNumber; - sqlType = "VARCHAR2(256)"; + sqlType = "VARCHAR2(255)"; allowsNull = YES; }, { diff --git a/OGoContentStore/contact.ocs b/OGoContentStore/contact.ocs index 40b8e0616..84984796d 100644 --- a/OGoContentStore/contact.ocs +++ b/OGoContentStore/contact.ocs @@ -6,53 +6,53 @@ fields = ( { columnName = c_name; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = NO; isPrimaryKey = YES; }, { columnName = c_givenname; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { columnName = c_cn; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { columnName = c_sn; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { columnName = c_screenname; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { columnName = c_l; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { columnName = c_mail; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { columnName = c_o; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { columnName = c_ou; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { columnName = c_telephoneNumber; - sqlType = "VARCHAR(256)"; + sqlType = "VARCHAR(255)"; allowsNull = YES; }, { diff --git a/SOPE/sope-patchset-r1664.diff b/SOPE/sope-patchset-r1664.diff index b44efeb73..5400357d8 100644 --- a/SOPE/sope-patchset-r1664.diff +++ b/SOPE/sope-patchset-r1664.diff @@ -401,7 +401,7 @@ Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m +/* GCSEOAdaptorChannel protocol */ +static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ -+ @" c_name VARCHAR (256) NOT NULL PRIMARY KEY,\n" ++ @" c_name VARCHAR (255) NOT NULL PRIMARY KEY,\n" + @" c_content VARCHAR (100000) NOT NULL,\n" + @" c_creationdate INT4 NOT NULL,\n" + @" c_lastmodified INT4 NOT NULL,\n" @@ -409,8 +409,8 @@ Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m + @" c_deleted INT4 NULL\n" + @")"); +static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \ -+ @" c_uid VARCHAR (256) NOT NULL,\n" -+ @" c_object VARCHAR (256) NOT NULL,\n" ++ @" c_uid VARCHAR (255) NOT NULL,\n" ++ @" c_object VARCHAR (255) NOT NULL,\n" + @" c_role VARCHAR (80) NOT NULL\n" + @")"); + @@ -445,7 +445,7 @@ Index: sope-gdl1/MySQL/MySQL4Channel.m +/* GCSEOAdaptorChannel protocol */ +static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ -+ @" c_name VARCHAR (256) NOT NULL PRIMARY KEY,\n" ++ @" c_name VARCHAR (255) NOT NULL PRIMARY KEY,\n" + @" c_content VARCHAR (100000) NOT NULL,\n" + @" c_creationdate INT NOT NULL,\n" + @" c_lastmodified INT NOT NULL,\n" @@ -453,8 +453,8 @@ Index: sope-gdl1/MySQL/MySQL4Channel.m + @" c_deleted INT NULL\n" + @")"); +static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \ -+ @" c_uid VARCHAR (256) NOT NULL,\n" -+ @" c_object VARCHAR (256) NOT NULL,\n" ++ @" c_uid VARCHAR (255) NOT NULL,\n" ++ @" c_object VARCHAR (255) NOT NULL,\n" + @" c_role VARCHAR (80) NOT NULL\n" + @")"); + @@ -795,10 +795,21 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m /* GCSEOAdaptorChannel protocol */ static NSString *sqlFolderFormat = (@"CREATE TABLE %@ (\n" \ - @" c_name VARCHAR2 (256) NOT NULL,\n" -+ @" c_name VARCHAR2 (256) NOT NULL PRIMARY KEY,\n" ++ @" c_name VARCHAR2 (255) NOT NULL PRIMARY KEY,\n" @" c_content CLOB NOT NULL,\n" @" c_creationdate INTEGER NOT NULL,\n" @" c_lastmodified INTEGER NOT NULL,\n" +@@ -617,8 +714,8 @@ + @" c_deleted INTEGER DEFAULT 0 NOT NULL\n" + @")"); + static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \ +- @" c_uid VARCHAR (256) NOT NULL,\n" +- @" c_object VARCHAR (256) NOT NULL,\n" ++ @" c_uid VARCHAR (255) NOT NULL,\n" ++ @" c_object VARCHAR (255) NOT NULL,\n" + @" c_role VARCHAR (80) NOT NULL\n" + @")"); + Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m =================================================================== --- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (revision 1664)