You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by gk...@apache.org on 2019/04/03 14:47:00 UTC
svn commit: r1856882 [2/2] - in /db/torque/torque4/trunk/torque-templates:
./ src/main/java/org/apache/torque/templates/transformer/om/
src/main/java/org/apache/torque/templates/transformer/sql/
src/main/java/org/apache/torque/templates/typemapping/ sr...
Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-extext-schema-idtable-init.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-extext-schema-idtable-init.sql?rev=1856882&r1=1856881&r2=1856882&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-extext-schema-idtable-init.sql (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-extext-schema-idtable-init.sql Wed Apr 3 14:46:59 2019
@@ -1,19 +1,19 @@
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements. See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership. The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing,
-## software distributed under the License is distributed on an
-## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-## KIND, either express or implied. See the License for the
-## specific language governing permissions and limitations
-## under the License.
-##
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (102, 'extext', 1000, 10);
-
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (102, 'extext', 1000, 10);
+
Propchange: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-extext-schema-idtable-init.sql
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-extext-schema.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-create.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-create.sql?rev=1856882&r1=1856881&r2=1856882&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-create.sql (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-create.sql Wed Apr 3 14:46:59 2019
@@ -1,19 +1,19 @@
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements. See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership. The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing,
-## software distributed under the License is distributed on an
-## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-## KIND, either express or implied. See the License for the
-## specific language governing permissions and limitations
-## under the License.
-##
-drop database if exists bookstore;
-create database bookstore;
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+drop database if exists bookstore;
+create database bookstore;
Propchange: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-create.sql
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-idtable-init.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-idtable-init.sql?rev=1856882&r1=1856881&r2=1856882&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-idtable-init.sql (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-idtable-init.sql Wed Apr 3 14:46:59 2019
@@ -1,31 +1,31 @@
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements. See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership. The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing,
-## software distributed under the License is distributed on an
-## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-## KIND, either express or implied. See the License for the
-## specific language governing permissions and limitations
-## under the License.
-##
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (103, 'a', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (104, 'b', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (105, 'r_ab', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (106, 'c', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (107, 'd', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (108, 'nopk', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (109, 'MULTIPK_SELF_REFTABLE', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (110, 'ifc_table', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (111, 'ifc_table2', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (112, 'INHERITANCE_TEST', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (113, 'ext_schema', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (114, 'extext_schema', 1000, 10);
-insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (115, 'qualified_name', 1000, 10);
-
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements. See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership. The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied. See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (103, 'a', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (104, 'b', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (105, 'r_ab', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (106, 'c', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (107, 'd', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (108, 'nopk', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (109, 'MULTIPK_SELF_REFTABLE', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (110, 'ifc_table', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (111, 'ifc_table2', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (112, 'INHERITANCE_TEST', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (113, 'ext_schema', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (114, 'extext_schema', 1000, 10);
+insert into ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (115, 'qualified_name', 1000, 10);
+
Propchange: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema-idtable-init.sql
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/expected-schema.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/expected-schema.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/jdbc2schemaTest.sql
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/jdbc2schemaTest.sql?rev=1856882&r1=1856881&r2=1856882&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/jdbc2schemaTest.sql (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/jdbc2schemaTest.sql Wed Apr 3 14:46:59 2019
@@ -1,57 +1,57 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements. See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership. The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License. You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied. See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- -----------------------------------------------------------------------
--- derby SQL script for schema bookstore
--- -----------------------------------------------------------------------
-
-
-
--- -----------------------------------------------------------------------
--- book
--- -----------------------------------------------------------------------
-CREATE TABLE book
-(
- book_id INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- isbn VARCHAR(15),
- author_id INTEGER NOT NULL,
- title VARCHAR(255) NOT NULL default 'no title',
- PRIMARY KEY(book_id));
-
-
-
-
--- -----------------------------------------------------------------------
--- author
--- -----------------------------------------------------------------------
-CREATE TABLE author
-(
- author_id INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
- name VARCHAR(50) NOT NULL,
- created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
- updated_at TIMESTAMP NOT NULL,
- PRIMARY KEY(author_id));
-
-
-
-
-ALTER TABLE book
- ADD CONSTRAINT book_FK_1
- FOREIGN KEY (author_id)
- REFERENCES author (author_id);
-
-
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+-- -----------------------------------------------------------------------
+-- derby SQL script for schema bookstore
+-- -----------------------------------------------------------------------
+
+
+
+-- -----------------------------------------------------------------------
+-- book
+-- -----------------------------------------------------------------------
+CREATE TABLE book
+(
+ book_id INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+ isbn VARCHAR(15),
+ author_id INTEGER NOT NULL,
+ title VARCHAR(255) NOT NULL default 'no title',
+ PRIMARY KEY(book_id));
+
+
+
+
+-- -----------------------------------------------------------------------
+-- author
+-- -----------------------------------------------------------------------
+CREATE TABLE author
+(
+ author_id INTEGER NOT NULL GENERATED BY DEFAULT AS IDENTITY,
+ name VARCHAR(50) NOT NULL,
+ created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+ updated_at TIMESTAMP NOT NULL,
+ PRIMARY KEY(author_id));
+
+
+
+
+ALTER TABLE book
+ ADD CONSTRAINT book_FK_1
+ FOREIGN KEY (author_id)
+ REFERENCES author (author_id);
+
+
Propchange: db/torque/torque4/trunk/torque-templates/src/test/resources/org/apache/torque/templates/jdbc2schema/jdbc2schemaTest.sql
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml?rev=1856882&r1=1856881&r2=1856882&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml Wed Apr 3 14:46:59 2019
@@ -70,7 +70,6 @@
name="enum"
type="VARCHAR"
size="50"
- scale=""
default="x">
<enum-value value="x"/>
<enum-value value="y"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org